Skip to content

K
k3s
Unverified Commit 9e22489d authored by Derek Nola's avatar Derek Nola Committed by GitHub
Browse files
Options

[Release-1.25] Enhance `check-config` (#7164)

* Add missing kernel config checks (#6946) Add additional kernel config checks for NETFILTER_XT_MATCH_COMMENT and NETFILTER_XT_MATCH_MULTIPORT as they are both required to run k3s. Signed-off-by: 's avatarRichard Steinmetz <richard@steinmetz.cloud> * Enhance `k3s check-config` (#7091) * Move CONFIG_CGROUP_PIDS to Required Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com> --------- Signed-off-by: 's avatarRichard Steinmetz <richard@steinmetz.cloud> Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com> Co-authored-by: 's avatarRichard Steinmetz <richard@steinmetz.cloud>
parent 6c5ac022
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
contrib/util/check-config.sh
View file @ 9e22489d
...@@ -177,8 +177,15 @@ echo ...@@ -177,8 +177,15 @@ echo
if [ -s .links ]; then if [ -s .links ]; then
while read file link; do while read file link; do
if [ "$(readlink $file)" != "$link" ]; then if [ "$(readlink $file)" != "$link" ]; then
wrap_bad '- links' "$file should link to $link" # If no iptables is installed on the host system, the symlink will be different
linkFail=1 if [ "$(readlink $file)" = "xtables-legacy-multi" ]; then
wrap_warn "- $file" "symlink to xtables-legacy-multi"
elif [ "$(readlink $file)" = "xtables-nft-multi" ]; then
wrap_warn "- $file" "symlink to xtables-nft-multi"
else
wrap_bad "- $file" "symlink to $link"
linkFail=1
fi
fi fi
done <.links done <.links
if [ $linkFail -eq 0 ]; then if [ $linkFail -eq 0 ]; then
...@@ -374,11 +381,11 @@ fi ...@@ -374,11 +381,11 @@ fi
flags=" flags="
NAMESPACES NET_NS PID_NS IPC_NS UTS_NS NAMESPACES NET_NS PID_NS IPC_NS UTS_NS
CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG CGROUPS CGROUP_PIDS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
KEYS KEYS
VETH BRIDGE BRIDGE_NETFILTER VETH BRIDGE BRIDGE_NETFILTER
IP_NF_FILTER IP_NF_TARGET_MASQUERADE IP_NF_FILTER IP_NF_TARGET_MASQUERADE
NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NETFILTER_XT_MATCH_IPVS NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NETFILTER_XT_MATCH_IPVS NETFILTER_XT_MATCH_COMMENT NETFILTER_XT_MATCH_MULTIPORT
IP_NF_NAT NF_NAT IP_NF_NAT NF_NAT
POSIX_MQUEUE POSIX_MQUEUE
" "
...@@ -398,9 +405,6 @@ echo 'Optional Features:' ...@@ -398,9 +405,6 @@ echo 'Optional Features:'
{ {
check_flags SECCOMP check_flags SECCOMP
} }
{
check_flags CGROUP_PIDS
}
# { # {
# check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED # check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED
# if [ -e /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes ]; then # if [ -e /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment