From 3f98c1def2ce9108b4184d57ea69c66bfaa7ebd7 Mon Sep 17 00:00:00 2001
From: Abubakr-Sadik Nii Nai Davis <dwa2pac@gmail.com>
Date: Wed, 27 Feb 2019 21:28:02 +0000
Subject: [PATCH] Fix wrong reference to kubelet.config in node checks.
This fix applies to only checks for kubernetes versions 1.8 and 1.11.
See https://github.com/aquasecurity/kube-bench/pull/208.
---
cfg/1.11/node.yaml | 28 ++++++++++++++--------------
cfg/1.8/node.yaml | 41 ++++++++++++++++++++---------------------
cfg/config.yaml | 1 +
3 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/cfg/1.11/node.yaml b/cfg/1.11/node.yaml
index 713ba47..7b808ba 100644
--- a/cfg/1.11/node.yaml
+++ b/cfg/1.11/node.yaml
@@ -19,7 +19,7 @@ groups:
value: false
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--allow-privileged=false
Based on your system, restart the kubelet service. For example:
@@ -41,7 +41,7 @@ groups:
If using a Kubelet config file, edit the file to set authentication: anonymous: enabled to
false .
If using executable arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--anonymous-auth=false
Based on your system, restart the kubelet service. For example:
@@ -62,7 +62,7 @@ groups:
remediation: |
If using a Kubelet config file, edit the file to set authorization: mode to Webhook.
If using executable arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameter in KUBELET_AUTHZ_ARGS variable.
--authorization-mode=Webhook
Based on your system, restart the kubelet service. For example:
@@ -81,7 +81,7 @@ groups:
If using a Kubelet config file, edit the file to set authentication: x509: clientCAFile to
the location of the client CA file.
If using command line arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameter in KUBELET_AUTHZ_ARGS variable.
--client-ca-file=<path/to/client-ca-file>
Based on your system, restart the kubelet service. For example:
@@ -102,7 +102,7 @@ groups:
remediation: |
If using a Kubelet config file, edit the file to set readOnlyPort to 0 .
If using command line arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--read-only-port=0
Based on your system, restart the kubelet service. For example:
@@ -124,7 +124,7 @@ groups:
If using a Kubelet config file, edit the file to set streamingConnectionIdleTimeout to a
value other than 0.
If using command line arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--streaming-connection-idle-timeout=5m
Based on your system, restart the kubelet service. For example:
@@ -145,7 +145,7 @@ groups:
remediation: |
If using a Kubelet config file, edit the file to set protectKernelDefaults: true .
If using command line arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--protect-kernel-defaults=true
Based on your system, restart the kubelet service. For example:
@@ -169,7 +169,7 @@ groups:
remediation: |
If using a Kubelet config file, edit the file to set makeIPTablesUtilChains: true .
If using command line arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
remove the --make-iptables-util-chains argument from the
KUBELET_SYSTEM_PODS_ARGS variable.
Based on your system, restart the kubelet service. For example:
@@ -185,7 +185,7 @@ groups:
- flag: "--hostname-override"
set: false
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and remove the --hostname-override argument from the
KUBELET_SYSTEM_PODS_ARGS variable.
Based on your system, restart the kubelet service. For example:
@@ -206,7 +206,7 @@ groups:
remediation: |
If using a Kubelet config file, edit the file to set eventRecordQPS: 0 .
If using command line arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--event-qps=0
Based on your system, restart the kubelet service. For example:
@@ -229,7 +229,7 @@ groups:
file to use to identify this Kubelet, and tlsPrivateKeyFile to the location of the
corresponding private key file.
If using command line arguments, edit the kubelet service file
- $kubeletconf on each worker node and
+ $kubeletsvc on each worker node and
set the below parameters in KUBELET_CERTIFICATE_ARGS variable.
--tls-cert-file=<path/to/tls-certificate-file>
file=<path/to/tls-key-file>
@@ -252,7 +252,7 @@ groups:
- flag: "--cadvisor-port"
set: false
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_CADVISOR_ARGS variable.
--cadvisor-port=0
Based on your system, restart the kubelet service. For example:
@@ -272,7 +272,7 @@ groups:
set: true
remediation: |
If using a Kubelet config file, edit the file to add the line rotateCertificates: true.
- If using command line arguments, edit the kubelet service file $kubeletconf
+ If using command line arguments, edit the kubelet service file $kubeletsvc
on each worker node and add --rotate-certificates=true argument to the KUBELET_CERTIFICATE_ARGS variable.
Based on your system, restart the kubelet service. For example:
systemctl daemon-reload
@@ -290,7 +290,7 @@ groups:
value: true
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_CERTIFICATE_ARGS variable.
--feature-gates=RotateKubeletServerCertificate=true
Based on your system, restart the kubelet service. For example:
diff --git a/cfg/1.8/node.yaml b/cfg/1.8/node.yaml
index d279c2e..db47007 100644
--- a/cfg/1.8/node.yaml
+++ b/cfg/1.8/node.yaml
@@ -19,7 +19,7 @@ groups:
value: false
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--allow-privileged=false
Based on your system, restart the kubelet service. For example:
@@ -38,7 +38,7 @@ groups:
value: false
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--anonymous-auth=false
Based on your system, restart the kubelet service. For example:
@@ -57,7 +57,7 @@ groups:
value: "AlwaysAllow"
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_AUTHZ_ARGS variable.
--authorization-mode=Webhook
Based on your system, restart the kubelet service. For example:
@@ -73,7 +73,7 @@ groups:
- flag: "--client-ca-file"
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_AUTHZ_ARGS variable.
--client-ca-file=<path/to/client-ca-file>
Based on your system, restart the kubelet service. For example:
@@ -92,7 +92,7 @@ groups:
value: 0
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--read-only-port=0
Based on your system, restart the kubelet service. For example:
@@ -111,7 +111,7 @@ groups:
value: 0
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--streaming-connection-idle-timeout=5m
Based on your system, restart the kubelet service. For example:
@@ -130,7 +130,7 @@ groups:
value: true
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--protect-kernel-defaults=true
Based on your system, restart the kubelet service. For example:
@@ -150,7 +150,7 @@ groups:
value: true
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and remove the --make-iptables-util-chains argument from the
KUBELET_SYSTEM_PODS_ARGS variable.
Based on your system, restart the kubelet service. For example:
@@ -169,7 +169,7 @@ groups:
value: false
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--keep-terminated-pod-volumes=false
Based on your system, restart the kubelet service. For example:
@@ -185,7 +185,7 @@ groups:
- flag: "--hostname-override"
set: false
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and remove the --hostname-override argument from the
KUBELET_SYSTEM_PODS_ARGS variable.
Based on your system, restart the kubelet service. For example:
@@ -204,7 +204,7 @@ groups:
value: 0
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
--event-qps=0
Based on your system, restart the kubelet service. For example:
@@ -223,8 +223,7 @@ groups:
set: true
remediation: |
Follow the Kubernetes documentation and set up the TLS connection on the Kubelet.
- Then edit the kubelet service file /etc/systemd/system/kubelet.service.d/10-
- kubeadm.conf on each worker node and set the below parameters in
+ Then edit the kubelet service file $kubeletsvc on each worker node and set the below parameters in
KUBELET_CERTIFICATE_ARGS variable.
--tls-cert-file=<path/to/tls-certificate-file>
file=<path/to/tls-key-file>
@@ -245,7 +244,7 @@ groups:
value: 0
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_CADVISOR_ARGS variable.
--cadvisor-port=0
Based on your system, restart the kubelet service. For example:
@@ -264,7 +263,7 @@ groups:
value: true
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and remove the --feature-
gates=RotateKubeletClientCertificate=false argument from the
KUBELET_CERTIFICATE_ARGS variable.
@@ -284,7 +283,7 @@ groups:
value: true
set: true
remediation: |
- Edit the kubelet service file $kubeletconf
+ Edit the kubelet service file $kubeletsvc
on each worker node and set the below parameter in KUBELET_CERTIFICATE_ARGS variable.
--feature-gates=RotateKubeletServerCertificate=true
Based on your system, restart the kubelet service. For example:
@@ -336,13 +335,13 @@ groups:
remediation: |
Run the below command (based on the file location on your system) on the each worker
node. For example,
- chown root:root /etc/kubernetes/kubelet.conf
+ chown root:root $kubeletconf
scored: true
- id: 2.2.3
text: "Ensure that the kubelet service file permissions are set to 644 or
more restrictive (Scored)"
- audit: "/bin/sh -c 'if test -e $kubeletconf; then stat -c %a $kubeletconf; fi'"
+ audit: "/bin/sh -c 'if test -e $kubeletsvc; then stat -c %a $kubeletsvc; fi'"
tests:
bin_op: or
test_items:
@@ -364,12 +363,12 @@ groups:
remediation: |
Run the below command (based on the file location on your system) on the each worker
node. For example,
- chmod 755 $kubeletconf
+ chmod 755 $kubeletsvc
scored: true
- id: 2.2.4
text: "2.2.4 Ensure that the kubelet service file ownership is set to root:root (Scored)"
- audit: "/bin/sh -c 'if test -e $kubeletconf; then stat -c %U:%G $kubeletconf; fi'"
+ audit: "/bin/sh -c 'if test -e $kubeletsvc; then stat -c %U:%G $kubeletsvc; fi'"
tests:
test_items:
- flag: "root:root"
@@ -377,7 +376,7 @@ groups:
remediation: |
Run the below command (based on the file location on your system) on the each worker
node. For example,
- chown root:root $kubeletconf
+ chown root:root $kubeletsvc
scored: true
- id: 2.2.5
diff --git a/cfg/config.yaml b/cfg/config.yaml
index f25ebc0..563bb5e 100644
--- a/cfg/config.yaml
+++ b/cfg/config.yaml
@@ -82,6 +82,7 @@ node:
- /etc/kubernetes/kubelet.conf
- /etc/kubernetes/kubelet
defaultconf: "/etc/kubernetes/kubelet.conf"
+ defaultsvc: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
proxy:
bins:
--
GitLab