Repository: aquasecurity/kube-bench
Pull request #702 (2020-09-16 07:38:27)

Not exiting when executable not found
Regrading https://github.com/aquasecurity/kube-bench/issues/701 where kube bench is crushing when not finding components

codecov[bot]: # [Codecov](https://codecov.io/gh/aquasecurity/kube-bench/pull/702?src=pr&el=h1) Report
> Merging [#702](https://codecov.io/gh/aquasecurity/kube-bench/pull/702?src=pr&el=desc) into [master](https://codecov.io/gh/aquasecurity/kube-bench/commit/1899f26bc1c89f005dca820208f3f5d7f9a43be9?el=desc) will **not change** coverage.
> The diff coverage is `0.00%`.

[![Impacted file tree graph](https://codecov.io/gh/aquasecurity/kube-bench/pull/702/graphs/tree.svg?width=650&height=150&src=pr&token=MVaDEmdgi9)](https://codecov.io/gh/aquasecurity/kube-bench/pull/702?src=pr&el=tree)

```diff
@@           Coverage Diff           @@
##           master     #702   +/-   ##
=======================================
  Coverage   64.57%   64.57%           
=======================================
  Files          12       12           
  Lines        1163     1163           
=======================================
  Hits          751      751           
  Misses        373      373           
  Partials       39       39           
```


| [Impacted Files](https://codecov.io/gh/aquasecurity/kube-bench/pull/702?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [cmd/common.go](https://codecov.io/gh/aquasecurity/kube-bench/pull/702/diff?src=pr&el=tree#diff-Y21kL2NvbW1vbi5nbw==) | `41.26% <0.00%> (ø)` | |

------

[Continue to review full report at Codecov](https://codecov.io/gh/aquasecurity/kube-bench/pull/702?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/aquasecurity/kube-bench/pull/702?src=pr&el=footer). Last update [1899f26...2a0456e](https://codecov.io/gh/aquasecurity/kube-bench/pull/702?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


Patch:
diff --git a/.travis.yml b/.travis.yml
index 81daddb..d05adcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,10 @@ before_install:
   - pip install --user yamllint==1.18.0
   - gem install --no-document fpm
   - go get -t -v ./...
-  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  - |
+    if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
+      echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+    fi
 
 script:
   - yamllint -c ./.yamllint.yaml .
@@ -28,7 +31,10 @@ script:
   - test -d cfg
   - test -f kube-bench
   # Build and push the multi-arch Docker image
-  - make docker
+  - |
+    if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
+      make docker
+    fi
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/Dockerfile b/Dockerfile
index 1ce9da2..2cca9e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14.0 AS build
+FROM golang:1.15 AS build
 WORKDIR /go/src/github.com/aquasecurity/kube-bench/
 COPY go.mod go.sum ./
 COPY main.go .
diff --git a/README.md b/README.md
index 28186e9..5ab857b 100644
--- a/README.md
+++ b/README.md
@@ -56,9 +56,8 @@ kube-bench supports the tests for Kubernetes as defined in the [CIS Kubernetes B
 
 | CIS Kubernetes Benchmark | kube-bench config | Kubernetes versions |
 |---|---|---|
-| [1.3.0](https://workbench.cisecurity.org/benchmarks/602) | cis-1.3 | 1.11-1.12 |
-| [1.4.1](https://workbench.cisecurity.org/benchmarks/2351) | cis-1.4 | 1.13-1.14 |
 | [1.5.1](https://workbench.cisecurity.org/benchmarks/4892) | cis-1.5 | 1.15- |
+| [1.6.0](https://workbench.cisecurity.org/benchmarks/4834) | cis-1.6 | 1.16- |
 | [GKE 1.0.0](https://workbench.cisecurity.org/benchmarks/4536) | gke-1.0 | GKE |
 | [EKS 1.0.0](https://workbench.cisecurity.org/benchmarks/5190) | eks-1.0 | EKS |
 | Red Hat OpenShift hardening guide | rh-0.7 | OCP 3.10-3.11 |
@@ -98,18 +97,18 @@ Or run kube-bench against a worker node using the tests for Kubernetes version 1
 kube-bench node --version 1.13
 ```
 
-`kube-bench` will map the `--version` to the corresponding CIS Benchmark version as indicated by the mapping table above. For example, if you specify `--version 1.13`, this is mapped to CIS Benchmark version `cis-1.14`.
+`kube-bench` will map the `--version` to the corresponding CIS Benchmark version as indicated by the mapping table above. For example, if you specify `--version 1.15`, this is mapped to CIS Benchmark version `cis-1.15`.
 
 Alternatively, you can specify `--benchmark` to run a specific CIS Benchmark version:
 
 ```
-kube-bench node --benchmark cis-1.4
+kube-bench node --benchmark cis-1.5
 ```
 
 If you want to target specific CIS Benchmark `target` (i.e master, node, etcd, etc...)
 you can use the `run --targets` subcommand.
 ```
-kube-bench --benchmark cis-1.4 run --targets master,node
+kube-bench --benchmark cis-1.5 run --targets master,node
 ```
 or
 ```
@@ -119,16 +118,15 @@ kube-bench --benchmark cis-1.5 run --targets master,node,etcd,policies
 The following table shows the valid targets based on the CIS Benchmark version.
 | CIS Benchmark | Targets |
 |---|---|
-| cis-1.3| master, node |
-| cis-1.4| master, node |
 | cis-1.5| master, controlplane, node, etcd, policies |
+| cis-1.6| master, controlplane, node, etcd, policies |
 | gke-1.0| master, controlplane, node, etcd, policies, managedservices |
 | eks-1.0| controlplane, node, policies, managedservices |
 
 If no targets are specified, `kube-bench` will determine the appropriate targets based on the CIS Benchmark version.
 
 `controls` for the various versions of CIS Benchmark can be found in directories
-with same name as the CIS Benchmark versions under `cfg/`, for example `cfg/cis-1.4`.
+with same name as the CIS Benchmark versions under `cfg/`, for example `cfg/cis-1.5`.
 
 **Note:**  **`It is an error to specify both --version and --benchmark flags together`**
 
diff --git a/cfg/cis-1.3/master.yaml b/cfg/cis-1.3/master.yaml
deleted file mode 100644
index 2239cee..0000000
--- a/cfg/cis-1.3/master.yaml
+++ /dev/null
@@ -1,1414 +0,0 @@
----
-controls:
-version: 1.11
-id: 1
-text: "Master Node Security Configuration"
-type: "master"
-groups:
-  - id: 1.1
-    text: "API Server"
-    checks:
-      - id: 1.1.1
-        text: "Ensure that the --anonymous-auth argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--anonymous-auth"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --anonymous-auth=false
-        scored: true
-
-      - id: 1.1.2
-        text: "Ensure that the --basic-auth-file argument is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--basic-auth-file"
-              set: false
-        remediation: |
-          Follow the documentation and configure alternate mechanisms for authentication. Then,
-          edit the API server pod specification file $apiserverconf
-          on the master node and remove the --basic-auth-file=<filename>
-          parameter.
-        scored: true
-
-      - id: 1.1.3
-        text: "Ensure that the --insecure-allow-any-token argument is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--insecure-allow-any-token"
-              set: false
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and remove the --insecure-allow-any-token
-          parameter.
-        scored: true
-
-      - id: 1.1.4
-        text: "Ensure that the --kubelet-https argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--kubelet-https"
-              compare:
-                op: eq
-                value: true
-              set: true
-            - flag: "--kubelet-https"
-              set: false
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and remove the --kubelet-https parameter.
-        scored: true
-
-      - id: 1.1.5
-        text: "Ensure that the --insecure-bind-address argument is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--insecure-bind-address"
-              set: false
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and remove the --insecure-bind-address
-          parameter.
-        scored: true
-
-      - id: 1.1.6
-        text: "Ensure that the --insecure-port argument is set to 0 (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--insecure-port"
-              compare:
-                op: eq
-                value: 0
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          apiserver.yaml on the master node and set the below parameter.
-          --insecure-port=0
-        scored: true
-
-      - id: 1.1.7
-        text: "Ensure that the --secure-port argument is not set to 0 (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--secure-port"
-              compare:
-                op: gt
-                value: 0
-              set: true
-            - flag: "--secure-port"
-              set: false
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and either remove the --secure-port parameter or
-          set it to a different (non-zero) desired port.
-        scored: true
-
-      - id: 1.1.8
-        text: "Ensure that the --profiling argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--profiling"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --profiling=false
-        scored: true
-
-      - id: 1.1.9
-        text: "Ensure that the --repair-malformed-updates argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--repair-malformed-updates"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --repair-malformed-updates=false
-        scored: true
-
-      - id: 1.1.10
-        text: "Ensure that the admission control plugin AlwaysAdmit is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: nothave
-                value: AlwaysAdmit
-              set: true
-            - flag: "--enable-admission-plugins"
-              set: false
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that does not include AlwaysAdmit.
-        scored: true
-
-      - id: 1.1.11
-        text: "Ensure that the admission control plugin AlwaysPullImages is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "AlwaysPullImages"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins to
-          include AlwaysPullImages.
-          --enable-admission-plugins=...,AlwaysPullImages,...
-        scored: true
-
-      - id: 1.1.12
-        text: "Ensure that the admission control plugin DenyEscalatingExec is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "DenyEscalatingExec"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that includes DenyEscalatingExec.
-          --enable-admission-plugins=...,DenyEscalatingExec,...
-        scored: true
-
-      - id: 1.1.13
-        text: "Ensure that the admission control plugin SecurityContextDeny is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "SecurityContextDeny"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to
-          include SecurityContextDeny.
-          --enable-admission-plugins=...,SecurityContextDeny,...
-        scored: true
-
-      - id: 1.1.14
-        text: "Ensure that the admission control plugin NamespaceLifecycle is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--disable-admission-plugins"
-              compare:
-                op: nothave
-                value: "NamespaceLifecycle"
-              set: true
-            - flag: "--disable-admission-plugins"
-              set: false
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --disable-admission-plugins parameter to
-          ensure it does not include NamespaceLifecycle.
-          --disable-admission-plugins=...,NamespaceLifecycle,...
-        scored: true
-
-      - id: 1.1.15
-        text: "Ensure that the --audit-log-path argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--audit-log-path"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-path parameter to a suitable
-          path and file where you would like audit logs to be written, for example:
-          --audit-log-path=/var/log/apiserver/audit.log
-        scored: true
-
-      - id: 1.1.16
-        text: "Ensure that the --audit-log-maxage argument is set to 30 or as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--audit-log-maxage"
-              compare:
-                op: gte
-                value: 30
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-maxage parameter to 30 or
-          as an appropriate number of days: --audit-log-maxage=30
-        scored: true
-
-      - id: 1.1.17
-        text: "Ensure that the --audit-log-maxbackup argument is set to 10 or as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--audit-log-maxbackup"
-              compare:
-                op: gte
-                value: 10
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-maxbackup parameter to 10
-          or to an appropriate value.
-          --audit-log-maxbackup=10
-        scored: true
-
-      - id: 1.1.18
-        text: "Ensure that the --audit-log-maxsize argument is set to 100 or as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--audit-log-maxsize"
-              compare:
-                op: gte
-                value: 100
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-maxsize parameter to an
-          appropriate size in MB. For example, to set it as 100 MB:
-          --audit-log-maxsize=100
-        scored: true
-
-      - id: 1.1.19
-        text: "Ensure that the --authorization-mode argument is not set to AlwaysAllow (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--authorization-mode"
-              compare:
-                op: nothave
-                value: "AlwaysAllow"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --authorization-mode parameter to
-          values other than AlwaysAllow. One such example could be as below.
-          --authorization-mode=RBAC
-        scored: true
-
-      - id: 1.1.20
-        text: "Ensure that the --token-auth-file parameter is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--token-auth-file"
-              set: false
-        remediation: |
-          Follow the documentation and configure alternate mechanisms for authentication. Then,
-          edit the API server pod specification file $apiserverconf
-          on the master node and remove the --token-auth-file=<filename>
-          parameter.
-        scored: true
-
-      - id: 1.1.21
-        text: "Ensure that the --kubelet-certificate-authority argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--kubelet-certificate-authority"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and setup the TLS connection between the
-          apiserver and kubelets. Then, edit the API server pod specification file
-          $apiserverconf on the master node and set the --kubelet-certificate-authority
-          parameter to the path to the cert file for the certificate authority.
-          --kubelet-certificate-authority=<ca-string>
-        scored: true
-
-      - id: 1.1.22
-        text: "Ensure that the --kubelet-client-certificate and --kubelet-client-key arguments are set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: and
-          test_items:
-            - flag: "--kubelet-client-certificate"
-              set: true
-            - flag: "--kubelet-client-key"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection between the
-          apiserver and kubelets. Then, edit API server pod specification file
-          $apiserverconf on the master node and set the
-          kubelet client certificate and key parameters as below.
-          --kubelet-client-certificate=<path/to/client-certificate-file>
-          --kubelet-client-key=<path/to/client-key-file>
-        scored: true
-
-      - id: 1.1.23
-        text: "Ensure that the --service-account-lookup argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--service-account-lookup"
-              compare:
-                op: eq
-                value: true
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --service-account-lookup=true
-        scored: true
-
-      - id: 1.1.24
-        text: "Ensure that the admission control plugin PodSecurityPolicy is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "PodSecurityPolicy"
-              set: true
-        remediation: |
-          Follow the documentation and create Pod Security Policy objects as per your environment.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that includes PodSecurityPolicy :
-          --enable-admission-plugins=...,PodSecurityPolicy,...
-          Then restart the API Server.
-        scored: true
-
-      - id: 1.1.25
-        text: "Ensure that the --service-account-key-file argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--service-account-key-file"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --service-account-key-file parameter
-          to the public key file for service accounts:
-          --service-account-key-file=<filename>
-        scored: true
-
-      - id: 1.1.26
-        text: "Ensure that the --etcd-certfile and --etcd-keyfile arguments are set as
-          appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: and
-          test_items:
-            - flag: "--etcd-certfile"
-              set: true
-            - flag: "--etcd-keyfile"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection between the
-          apiserver and etcd. Then, edit the API server pod specification file
-          $apiserverconf on the master node and set the etcd
-          certificate and key file parameters.
-          --etcd-certfile=<path/to/client-certificate-file>
-          --etcd-keyfile=<path/to/client-key-file>
-        scored: true
-
-      - id: 1.1.27
-        text: "Ensure that the admission control plugin ServiceAccount is set(Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "ServiceAccount"
-              set: true
-            - flag: "--enable-admission-plugins"
-              set: false
-        remediation: |
-          Follow the documentation and create ServiceAccount objects as per your environment.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that includes ServiceAccount.
-          --enable-admission-plugins=...,ServiceAccount,...
-        scored: true
-
-      - id: 1.1.28
-        text: "Ensure that the --tls-cert-file and --tls-private-key-file arguments are set
-        as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: and
-          test_items:
-            - flag: "--tls-cert-file"
-              set: true
-            - flag: "--tls-private-key-file"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection on the apiserver.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the TLS certificate and private key file
-          parameters.
-          --tls-cert-file=<path/to/tls-certificate-file>
-          --tls-private-key-file=<path/to/tls-key-file>
-        scored: true
-
-      - id: 1.1.29
-        text: "Ensure that the --client-ca-file argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--client-ca-file"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection on the apiserver.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the client certificate authority file.
-          --client-ca-file=<path/to/client-ca-file>
-        scored: true
-
-      - id: 1.1.30
-        text: "Ensure that the API Server only makes use of Strong Cryptographic Ciphers (Not Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--tls-cipher-suites"
-              compare:
-                op: has
-                value: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
-        scored: false
-
-      - id: 1.1.31
-        text: "Ensure that the --etcd-cafile argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--etcd-cafile"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection between the
-          apiserver and etcd. Then, edit the API server pod specification file
-          $apiserverconf on the master node and set the etcd
-          certificate authority file parameter.
-          --etcd-cafile=<path/to/ca-file>
-        scored: true
-
-      - id: 1.1.32
-        text: "Ensure that the --authorization-mode argument is set to Node (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--authorization-mode"
-              compare:
-                op: has
-                value: "Node"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --authorization-mode parameter to a
-          value that includes Node.
-          --authorization-mode=Node,RBAC
-        scored: true
-
-      - id: 1.1.33
-        text: "Ensure that the admission control plugin NodeRestriction is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "NodeRestriction"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and configure NodeRestriction plug-in on
-          kubelets. Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that includes NodeRestriction.
-          --enable-admission-plugins=...,NodeRestriction,...
-        scored: true
-
-      - id: 1.1.34
-        text: "Ensure that the --experimental-encryption-provider-config argument is
-        set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--experimental-encryption-provider-config"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and configure a EncryptionConfig file.
-          Then, edit the API server pod specification file $apiserverconf on the
-          master node and set the --experimental-encryption-provider-config parameter
-          to the path of that file:
-          --experimental-encryption-provider-config=</path/to/EncryptionConfig/File>
-        scored: true
-
-      - id: 1.1.35
-        text: "Ensure that the encryption provider is set to aescbc (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and configure a EncryptionConfig file. In this file,
-          choose aescbc as the encryption provider.
-          For example,
-          kind: EncryptionConfig
-          apiVersion: v1
-          resources:
-            - resources:
-              - secrets
-                providers:
-                - aescbc:
-                    keys:
-                    - name: key1
-                      secret: <32-byte base64-encoded secret>
-        scored: true
-
-      - id: 1.1.36
-        text: "Ensure that the admission control plugin EventRateLimit is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "EventRateLimit"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and set the desired limits in a
-          configuration file. Then, edit the API server pod specification file
-          $apiserverconf and set the below parameters.
-          --enable-admission-plugins=...,EventRateLimit,...
-          --admission-control-config-file=<path/to/configuration/file>
-        scored: true
-
-      - id: 1.1.37a
-        text: "Ensure that the AdvancedAuditing argument is not set to false (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--feature-gates"
-              compare:
-                op: nothave
-                value: "AdvancedAuditing=false"
-              set: true
-            - flag: "--feature-gates"
-              set: false
-        remediation: |
-          Follow the Kubernetes documentation and set the desired audit policy in the
-          /etc/kubernetes/audit-policy.yaml file. Then, edit the API server pod specification file $apiserverconf
-          and set the below parameters.
-          --audit-policy-file=/etc/kubernetes/audit-policy.yaml
-        scored: true
-
-      - id: 1.1.37b
-        text: "Ensure that the AdvancedAuditing argument is not set to false (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--audit-policy-file"
-              compare:
-                op: eq
-                value: "/etc/kubernetes/audit-policy.yaml"
-              set: true
-            - flag: "--audit-policy-file"
-              compare:
-                op: eq
-                value: "/etc/kubernetes/audit-policy.yml"
-              set: true
-        remediation: |
-          Follow the Kubernetes documentation and set the desired audit policy in the
-          /etc/kubernetes/audit-policy.yaml file. Then, edit the API server pod specification file $apiserverconf
-          and set the below parameters.
-          --audit-policy-file=/etc/kubernetes/audit-policy.yaml
-        scored: true
-
-      - id: 1.1.38
-        text: "Ensure that the --request-timeout argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--request-timeout"
-              set: false
-            - flag: "--request-timeout"
-              set: true
-        remediation: |
-          Edit the API server pod specification file $apiserverconf
-          and set the below parameter as appropriate and if needed. For example,
-          --request-timeout=300s
-        scored: true
-
-      - id: 1.1.39
-        text: "Ensure that the API Server only makes use of Strong Cryptographic Ciphers ( Not Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--tls-cipher-suites"
-              compare:
-                op: eq
-                value: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256"
-              set: true
-        remediation: |
-          Edit the API server pod specification file /etc/kubernetes/manifests
-          kube-apiserver.yaml on the master node and set the below parameter.
-          --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
-        scored: false
-
-  - id: 1.2
-    text: "Scheduler"
-    checks:
-      - id: 1.2.1
-        text: "Ensure that the --profiling argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $schedulerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--profiling"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the Scheduler pod specification file $schedulerconf
-          file on the master node and set the below parameter.
-          --profiling=false
-        scored: true
-
-      - id: 1.2.2
-        text: "Ensure that the --address argument is set to 127.0.0.1 (Scored)"
-        audit: "/bin/ps -ef | grep $schedulerbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--address"
-              compare:
-                op: eq
-                value: "127.0.0.1"
-              set: true
-            - flag: "--address"
-              set: false
-        remediation: |
-          Edit the Scheduler pod specification file $schedulerconf
-          file on the master node and ensure the correct value for the
-          --address parameter.
-        scored: true
-
-  - id: 1.3
-    text: "Controller Manager"
-    checks:
-      - id: 1.3.1
-        text: "Ensure that the --terminated-pod-gc-threshold argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--terminated-pod-gc-threshold"
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the --terminated-pod-gc-threshold to an appropriate threshold, for example:
-          --terminated-pod-gc-threshold=10
-        scored: true
-
-      - id: 1.3.2
-        text: "Ensure that the --profiling argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--profiling"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the below parameter.
-          --profiling=false
-        scored: true
-
-      - id: 1.3.3
-        text: "Ensure that the --use-service-account-credentials argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--use-service-account-credentials"
-              compare:
-                op: noteq
-                value: false
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node to set the below parameter.
-          --use-service-account-credentials=true
-        scored: true
-
-      - id: 1.3.4
-        text: "Ensure that the --service-account-private-key-file argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--service-account-private-key-file"
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the --service-account-private-
-          key-file parameter to the private key file for service accounts.
-          --service-account-private-key-file=<filename>
-        scored: true
-
-      - id: 1.3.5
-        text: "Ensure that the --root-ca-file argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--root-ca-file"
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the --root-ca-file parameter to
-          the certificate bundle file.
-          --root-ca-file=<path/to/file>
-        scored: true
-
-      - id: 1.3.6
-        text: "Ensure that the RotateKubeletServerCertificate argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--feature-gates"
-              compare:
-                op: eq
-                value: "RotateKubeletServerCertificate=true"
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          controller-manager.yaml on the master node and set the --feature-gates parameter to
-          include RotateKubeletServerCertificate=true.
-          --feature-gates=RotateKubeletServerCertificate=true
-        scored: true
-
-      - id: 1.3.7
-        text: "Ensure that the --address argument is set to 127.0.0.1 (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--address"
-              compare:
-                op: eq
-                value: "127.0.0.1"
-              set: true
-            - flag: "--address"
-              set: false
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          controller-manager.yaml on the master node and ensure the correct value
-          for the --address parameter.
-        scored: true
-
-  - id: 1.4
-    text: "Configuration Files"
-    checks:
-      - id: 1.4.1
-        text: "Ensure that the API server pod specification file permissions are
-        set to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $apiserverconf; then stat -c permissions=%a $apiserverconf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 $apiserverconf
-        scored: true
-
-      - id: 1.4.2
-        text: "Ensure that the API server pod specification file ownership is set to
-        root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $apiserverconf; then stat -c %U:%G $apiserverconf; fi'"
-        tests:
-          test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $apiserverconf
-        scored: true
-
-      - id: 1.4.3
-        text: "Ensure that the controller manager pod specification file
-        permissions are set to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $controllermanagerconf; then stat -c permissions=%a $controllermanagerconf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 $controllermanagerconf
-        scored: true
-
-      - id: 1.4.4
-        text: "Ensure that the controller manager pod specification file
-        ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $controllermanagerconf; then stat -c %U:%G $controllermanagerconf; fi'"
-        tests:
-          test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $controllermanagerconf
-        scored: true
-
-      - id: 1.4.5
-        text: "Ensure that the scheduler pod specification file permissions are set
-        to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $schedulerconf; then stat -c permissions=%a $schedulerconf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 $schedulerconf
-        scored: true
-
-      - id: 1.4.6
-        text: "Ensure that the scheduler pod specification file ownership is set to
-        root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $schedulerconf; then stat -c %U:%G $schedulerconf; fi'"
-        tests:
-          test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $schedulerconf
-        scored: true
-
-      - id: 1.4.7
-        text: "Ensure that the etcd pod specification file permissions are set to
-        644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $etcdconf; then stat -c permissions=%a $etcdconf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 $etcdconf
-        scored: true
-
-      - id: 1.4.8
-        text: "Ensure that the etcd pod specification file ownership is set to
-        root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $etcdconf; then stat -c %U:%G $etcdconf; fi'"
-        tests:
-          test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $etcdconf
-        scored: true
-
-      - id: 1.4.9
-        text: "Ensure that the Container Network Interface file permissions are
-        set to 644 or more restrictive (Not Scored)"
-        audit: "stat -c permissions=%a <path/to/cni/files>"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 <path/to/cni/files>
-        scored: true
-
-      - id: 1.4.10
-        text: "Ensure that the Container Network Interface file ownership is set
-        to root:root (Not Scored)"
-        audit: "stat -c %U:%G <path/to/cni/files>"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root <path/to/cni/files>
-        scored: true
-
-      - id: 1.4.11
-        text: "Ensure that the etcd data directory permissions are set to 700 or more restrictive (Scored)"
-        audit: ps -ef | grep $etcdbin | grep -- --data-dir | sed 's%.*data-dir[= ]\([^ ]*\).*%\1%' | xargs stat -c permissions=%a
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "700"
-              set: true
-        remediation: |
-          On the etcd server node, get the etcd data directory, passed as an argument --data-dir ,
-          from the below command:
-          ps -ef | grep $etcdbin
-          Run the below command (based on the etcd data directory found above). For example,
-          chmod 700 /var/lib/etcd
-        scored: true
-
-      - id: 1.4.12
-        text: "Ensure that the etcd data directory ownership is set to etcd:etcd (Scored)"
-        audit: ps -ef | grep $etcdbin | grep -- --data-dir | sed 's%.*data-dir[= ]\([^ ]*\).*%\1%' | xargs stat -c %U:%G
-        tests:
-          test_items:
-            - flag: "etcd:etcd"
-              set: true
-        remediation: |
-          On the etcd server node, get the etcd data directory, passed as an argument --data-dir ,
-          from the below command:
-          ps -ef | grep $etcdbin
-          Run the below command (based on the etcd data directory found above). For example,
-          chown etcd:etcd /var/lib/etcd
-        scored: true
-
-      - id: 1.4.13
-        text: "Ensure that the admin.conf file permissions are set to 644 or
-        more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/admin.conf; then stat -c permissions=%a /etc/kubernetes/admin.conf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 /etc/kubernetes/admin.conf
-        scored: true
-
-      - id: 1.4.14
-        text: "Ensure that the admin.conf file ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/admin.conf; then stat -c %U:%G /etc/kubernetes/admin.conf; fi'"
-        tests:
-          test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root /etc/kubernetes/admin.conf
-        scored: true
-
-      - id: 1.4.15
-        text: "Ensure that the scheduler.conf file permissions are set to 644 or
-        more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/scheduler.conf; then stat -c permissions=%a /etc/kubernetes/scheduler.conf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chmod 644 /etc/kubernetes/scheduler.conf
-        scored: true
-
-      - id: 1.4.16
-        text: "Ensure that the scheduler.conf file ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/scheduler.conf; then stat -c %U:%G /etc/kubernetes/scheduler.conf; fi'"
-        tests:
-          test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chown root:root /etc/kubernetes/scheduler.conf
-        scored: true
-
-      - id: 1.4.17
-        text: "Ensure that the controller-manager.conf file permissions are set
-        to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/controller-manager.conf; then stat -c permissions=%a /etc/kubernetes/controller-manager.conf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chmod 644 /etc/kubernetes/controller-manager.conf
-        scored: true
-
-      - id: 1.4.18
-        text: "Ensure that the controller-manager.conf file ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/controller-manager.conf; then stat -c %U:%G /etc/kubernetes/controller-manager.conf; fi'"
-        tests:
-          test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chown root:root /etc/kubernetes/controller-manager.conf
-        scored: true
-
-  - id: 1.5
-    text: "etcd"
-    checks:
-      - id: 1.5.1
-        text: "Ensure that the --cert-file and --key-file arguments are set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--cert-file"
-              set: true
-            - flag: "--key-file"
-              set: true
-        remediation: |
-          Follow the etcd service documentation and configure TLS encryption.
-          Then, edit the etcd pod specification file $etcdconf on the
-          master node and set the below parameters.
-          --ca-file=</path/to/ca-file>
-          --key-file=</path/to/key-file>
-        scored: true
-
-      - id: 1.5.2
-        text: "Ensure that the --client-cert-auth argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--client-cert-auth"
-              compare:
-                op: noteq
-                value: false
-              set: true
-        remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and set the below parameter.
-          --client-cert-auth="true"
-        scored: true
-
-      - id: 1.5.3
-        text: "Ensure that the --auto-tls argument is not set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--auto-tls"
-              set: false
-            - flag: "--auto-tls"
-              compare:
-                op: eq
-                value: false
-        remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and either remove the --auto-tls parameter or set it to false.
-            --auto-tls=false
-        scored: true
-
-      - id: 1.5.4
-        text: "Ensure that the --peer-cert-file and --peer-key-file arguments are
-        set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          bin_op: and
-          test_items:
-            - flag: "--peer-cert-file"
-              set: true
-            - flag: "--peer-key-file"
-              set: true
-        remediation: |
-          Follow the etcd service documentation and configure peer TLS encryption as appropriate
-          for your etcd cluster. Then, edit the etcd pod specification file $etcdconf on the
-          master node and set the below parameters.
-          --peer-client-file=</path/to/peer-cert-file>
-          --peer-key-file=</path/to/peer-key-file>
-        scored: true
-
-      - id: 1.5.5
-        text: "Ensure that the --peer-client-cert-auth argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--peer-client-cert-auth"
-              compare:
-                op: eq
-                value: true
-              set: true
-        remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and set the below parameter.
-          --peer-client-cert-auth=true
-        scored: true
-
-      - id: 1.5.6
-        text: "Ensure that the --peer-auto-tls argument is not set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--peer-auto-tls"
-              set: false
-            - flag: "--peer-auto-tls"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and either remove the --peer-auto-tls parameter or set it to false.
-          --peer-auto-tls=false
-        scored: true
-
-      - id: 1.5.7
-        text: "Ensure that a unique Certificate Authority is used for etcd (Not Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        type: "manual"
-        tests:
-          test_items:
-            - flag: "--trusted-ca-file"
-              set: true
-        remediation: |
-          [Manual test]
-          Follow the etcd documentation and create a dedicated certificate authority setup for the
-          etcd service.
-          Then, edit the etcd pod specification file $etcdconf on the
-          master node and set the below parameter.
-          --trusted-ca-file=</path/to/ca-file>
-        scored: false
-
-  - id: 1.6
-    text: "General Security Primitives"
-    checks:
-      - id: 1.6.1
-        text: "Ensure that the cluster-admin role is only used where required (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Remove any unneeded clusterrolebindings :
-          kubectl delete clusterrolebinding [name]
-        scored: false
-
-      - id: 1.6.2
-        text: "Create administrative boundaries between resources using namespaces (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the documentation and create namespaces for objects in your deployment as you
-          need them.
-        scored: false
-
-      - id: 1.6.3
-        text: "Create network segmentation using Network Policies (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the documentation and create NetworkPolicy objects as you need them.
-        scored: false
-
-      - id: 1.6.4
-        text: "Ensure that the seccomp profile is set to docker/default in your pod
-        definitions (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Seccomp is an alpha feature currently. By default, all alpha features are disabled. So, you
-          would need to enable alpha features in the apiserver by passing "--feature-
-          gates=AllAlpha=true" argument.
-          Edit the $apiserverconf file on the master node and set the KUBE_API_ARGS
-          parameter to "--feature-gates=AllAlpha=true"
-          KUBE_API_ARGS="--feature-gates=AllAlpha=true"
-          Based on your system, restart the kube-apiserver service. For example:
-          systemctl restart kube-apiserver.service
-          Use annotations to enable the docker/default seccomp profile in your pod definitions. An
-          example is as below:
-          apiVersion: v1
-          kind: Pod
-          metadata:
-            name: trustworthy-pod
-            annotations:
-              seccomp.security.alpha.kubernetes.io/pod: docker/default
-          spec:
-            containers:
-              - name: trustworthy-container
-                image: sotrustworthy:latest
-        scored: false
-
-      - id: 1.6.5
-        text: "Apply Security Context to Your Pods and Containers (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and apply security contexts to your pods. For a
-          suggested list of security contexts, you may refer to the CIS Security Benchmark for Docker
-          Containers.
-        scored: false
-
-      - id: 1.6.6
-        text: "Configure Image Provenance using ImagePolicyWebhook admission controller (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and setup image provenance.
-        scored: false
-
-      - id: 1.6.7
-        text: "Configure Network policies as appropriate (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and setup network policies as appropriate.
-          For example, you could create a "default" isolation policy for a Namespace by creating a
-          NetworkPolicy that selects all pods but does not allow any traffic:
-          apiVersion: networking.k8s.io/v1
-          kind: NetworkPolicy
-          metadata:
-            name: default-deny
-          spec:
-            podSelector:
-        scored: false
-
-      - id: 1.6.8
-        text: "Place compensating controls in the form of PSP and RBAC for
-        privileged containers usage (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow Kubernetes documentation and setup PSP and RBAC authorization for your cluster.
-        scored: false
-
-  - id: 1.7
-    text: "PodSecurityPolicies"
-    checks:
-      - id: 1.7.1
-        text: "Do not admit privileged containers (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.privileged field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.2
-        text: "Do not admit containers wishing to share the host process ID namespace (Scored)"
-        type: "manual"
-        remediation: |
-         [Manual test]
-         Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.hostPID field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.3
-        text: "Do not admit containers wishing to share the host IPC namespace (Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.hostIPC field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.4
-        text: "Do not admit containers wishing to share the host network namespace (Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.hostNetwork field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.5
-        text: "Do not admit containers with allowPrivilegeEscalation (Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.allowPrivilegeEscalation field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.6
-        text: "Do not admit root containers (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.runAsUser.rule is set to either MustRunAsNonRoot or MustRunAs with the range of UIDs not including 0.
-        scored: false
-
-      - id: 1.7.7
-        text: "Do not admit containers with dangerous capabilities (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.requiredDropCapabilities is set to include either NET_RAW or ALL.
-        scored: false
diff --git a/cfg/cis-1.3/node.yaml b/cfg/cis-1.3/node.yaml
deleted file mode 100644
index ede4bcc..0000000
--- a/cfg/cis-1.3/node.yaml
+++ /dev/null
@@ -1,500 +0,0 @@
----
-controls:
-version: "1.11"
-id: "2"
-text: Worker Node Security Configuration
-type: "node"
-groups:
-  - id: "2.1"
-    text: Kubelet
-    checks:
-      - id: 2.1.1
-        text: Ensure that the --allow-privileged argument is set to false (Scored)
-        audit: "/bin/ps -fC $kubeletbin "
-        tests:
-          test_items:
-            - flag: --allow-privileged
-              set: true
-              compare:
-                op: eq
-                value: false
-        remediation: |
-          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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.2
-        text: Ensure that the --anonymous-auth argument is set to false (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --anonymous-auth
-              path: '{.authentication.anonymous.enabled}'
-              set: true
-              compare:
-                op: eq
-                value: false
-        remediation: |
-          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
-          $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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.3
-        text: Ensure that the --authorization-mode argument is not set to AlwaysAllow (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --authorization-mode
-              path: '{.authorization.mode}'
-              set: true
-              compare:
-                op: nothave
-                value: AlwaysAllow
-        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
-          $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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.4
-        text: Ensure that the --client-ca-file argument is set as appropriate (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --client-ca-file
-              path: '{.authentication.x509.clientCAFile}'
-              set: true
-        remediation: |
-          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
-          $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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.5
-        text: Ensure that the --read-only-port argument is set to 0 (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --read-only-port
-              path: '{.readOnlyPort}'
-              set: true
-              compare:
-                op: eq
-                value: 0
-        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
-          $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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.6
-        text: Ensure that the --streaming-connection-idle-timeout argument is not set to 0 (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --streaming-connection-idle-timeout
-              path: '{.streamingConnectionIdleTimeout}'
-              set: true
-              compare:
-                op: noteq
-                value: 0
-            - flag: --streaming-connection-idle-timeout
-              path: '{.streamingConnectionIdleTimeout}'
-              set: false
-          bin_op: or
-        remediation: |
-          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
-          $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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.7
-        text: Ensure that the --protect-kernel-defaults argument is set to true (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --protect-kernel-defaults
-              path: '{.protectKernelDefaults}'
-              set: true
-              compare:
-                op: eq
-                value: true
-        remediation: |
-          If using a Kubelet config file, edit the file to set protectKernelDefaults: true .
-          If using command line arguments, 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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.8
-        text: Ensure that the --make-iptables-util-chains argument is set to true (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --make-iptables-util-chains
-              path: '{.makeIPTablesUtilChains}'
-              set: true
-              compare:
-                op: eq
-                value: true
-            - flag: --make-iptables-util-chains
-              path: '{.makeIPTablesUtilChains}'
-              set: false
-          bin_op: or
-        remediation: |
-          If using a Kubelet config file, edit the file to set makeIPTablesUtilChains: true .
-          If using command line arguments, 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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.9
-        text: Ensure that the --hostname-override argument is not set (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --hostname-override
-              path: '{.hostnameOverride}'
-              set: false
-        remediation: |
-          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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.10
-        text: Ensure that the --event-qps argument is set to 0 (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --event-qps
-              path: '{.eventRecordQPS}'
-              set: true
-              compare:
-                op: eq
-                value: 0
-        remediation: |
-          If using a Kubelet config file, edit the file to set eventRecordQPS: 0 .
-          If using command line arguments, 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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.11
-        text: Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --tls-cert-file
-              path: '{.tlsCertFile}'
-              set: true
-            - flag: --tls-private-key-file
-              path: '{.tlsPrivateKeyFile}'
-              set: true
-          bin_op: and
-        remediation: |
-          If using a Kubelet config file, edit the file to set tlsCertFile to the location of the certificate
-          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
-          $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>
-          Based on your system, restart the kubelet service. For example:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.12
-        text: Ensure that the --cadvisor-port argument is set to 0 (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --cadvisor-port
-              path: '{.cadvisorPort}'
-              set: true
-              compare:
-                op: eq
-                value: 0
-            - flag: --cadvisor-port
-              path: '{.cadvisorPort}'
-              set: false
-          bin_op: or
-        remediation: |
-          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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.13
-        text: Ensure that the --rotate-certificates argument is not set to false (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --rotate-certificates
-              path: '{.rotateCertificates}'
-              set: true
-              compare:
-                op: eq
-                value: true
-            - flag: --rotate-certificates
-              path: '{.rotateCertificates}'
-              set: false
-          bin_op: or
-        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 $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
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.14
-        text: Ensure that the RotateKubeletServerCertificate argument is set to true (Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: RotateKubeletServerCertificate
-              path: '{.featureGates.RotateKubeletServerCertificate}'
-              set: true
-              compare:
-                op: eq
-                value: true
-        remediation: |
-          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:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.15
-        text: Ensure that the Kubelet only makes use of Strong Cryptographic Ciphers (Not Scored)
-        audit: "/bin/ps -fC $kubeletbin"
-        audit_config: "/bin/cat $kubeletconf"
-        tests:
-          test_items:
-            - flag: --tls-cipher-suites
-              path: '{.tlsCipherSuites}'
-              set: true
-              compare:
-                op: valid_elements
-                value: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
-        remediation: |
-          If using a Kubelet config file, edit the file to set TLSCipherSuites: to TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
-          If using executable arguments, edit the kubelet service file $kubeletsvc on each worker node and set the below parameter.
-          --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
-        scored: false
-
-  - id: "2.2"
-    text: Configuration Files
-    checks:
-      - id: 2.2.1
-        text: Ensure that the kubelet.conf file permissions are set to 644 or more restrictive (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletkubeconfig; then stat -c permissions=%a $kubeletkubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chmod 644 $kubeletkubeconfig
-        scored: true
-
-      - id: 2.2.2
-        text: Ensure that the kubelet.conf file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletkubeconfig; then stat -c %U:%G $kubeletkubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-              compare:
-                op: eq
-                value: root:root
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chown root:root $kubeletkubeconfig
-        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 $kubeletsvc; then stat -c permissions=%a $kubeletsvc; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              set: true
-              compare:
-                op: bitmask
-                value: "644"
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chmod 644 $kubeletsvc
-        scored: true
-
-      - id: 2.2.4
-        text: Ensure that the kubelet service file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletsvc; then stat -c %U:%G $kubeletsvc; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chown root:root $kubeletsvc
-        scored: true
-
-      - id: 2.2.5
-        text: Ensure that the proxy kubeconfig file permissions are set to 644 or more restrictive (Scored)
-        audit: '/bin/sh -c ''if test -e $proxykubeconfig; then stat -c permissions=%a $proxykubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              set: true
-              compare:
-                op: bitmask
-                value: "644"
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chmod 644 $proxykubeconfig
-        scored: true
-
-      - id: 2.2.6
-        text: Ensure that the proxy kubeconfig file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $proxykubeconfig; then stat -c %U:%G $proxykubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chown root:root $proxykubeconfig
-        scored: true
-
-      - id: 2.2.7
-        text: Ensure that the certificate authorities file permissions are set to 644 or more restrictive (Scored)
-        type: manual
-        remediation: |
-          Run the following command to modify the file permissions of the --client-ca-file
-          chmod 644 <filename>
-        scored: true
-
-      - id: 2.2.8
-        text: Ensure that the client certificate authorities file ownership is set to root:root (Scored)
-        audit: |
-          CAFILE=$(ps -ef | grep kubelet | grep -v apiserver | grep -- --client-ca-file= | awk -F '--client-ca-file=' '{print $2}' | awk '{print $1}')
-          if test -z $CAFILE; then CAFILE=$kubeletcafile; fi
-          if test -e $CAFILE; then stat -c %U:%G $CAFILE; fi
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-              compare:
-                op: eq
-                value: root:root
-        remediation: |
-          Run the following command to modify the ownership of the --client-ca-file .
-          chown root:root <filename>
-        scored: true
-
-      - id: 2.2.9
-        text: Ensure that the kubelet configuration file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletconf; then stat -c %U:%G $kubeletconf; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-        remediation: |
-          Run the following command (using the config file location identified in the Audit step)
-          chown root:root $kubeletconf
-        scored: true
-
-      - id: 2.2.10
-        text: Ensure that the kubelet configuration file has permissions set to 644 or more restrictive (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletconf; then stat -c permissions=%a $kubeletconf; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              set: true
-              compare:
-                op: bitmask
-                value: "644"
-        remediation: |
-          Run the following command (using the config file location identified in the Audit step)
-          chmod 644 $kubeletconf
-        scored: true
diff --git a/cfg/cis-1.4/config.yaml b/cfg/cis-1.4/config.yaml
deleted file mode 100644
index b783945..0000000
--- a/cfg/cis-1.4/config.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-## Version-specific settings that override the values in cfg/config.yaml
diff --git a/cfg/cis-1.3/config.yaml b/cfg/cis-1.6/config.yaml
similarity index 100%
rename from cfg/cis-1.3/config.yaml
rename to cfg/cis-1.6/config.yaml
diff --git a/cfg/cis-1.6/controlplane.yaml b/cfg/cis-1.6/controlplane.yaml
new file mode 100644
index 0000000..c116fdb
--- /dev/null
+++ b/cfg/cis-1.6/controlplane.yaml
@@ -0,0 +1,35 @@
+---
+controls:
+version: 1.6
+id: 3
+text: "Control Plane Configuration"
+type: "controlplane"
+groups:
+  - id: 3.1
+    text: "Authentication and Authorization"
+    checks:
+      - id: 3.1.1
+        text: "Client certificate authentication should not be used for users (Manual)"
+        type: "manual"
+        remediation: |
+          Alternative mechanisms provided by Kubernetes such as the use of OIDC should be
+          implemented in place of client certificates.
+        scored: false
+
+  - id: 3.2
+    text: "Logging"
+    checks:
+      - id: 3.2.1
+        text: "Ensure that a minimal audit policy is created (Manual)"
+        type: "manual"
+        remediation: |
+          Create an audit policy file for your cluster.
+        scored: false
+
+      - id: 3.2.2
+        text: "Ensure that the audit policy covers key security concerns (Manual)"
+        type: "manual"
+        remediation: |
+          Consider modification of the audit policy in use on the cluster to include these items, at a
+          minimum.
+        scored: false
diff --git a/cfg/cis-1.6/etcd.yaml b/cfg/cis-1.6/etcd.yaml
new file mode 100644
index 0000000..f17ab16
--- /dev/null
+++ b/cfg/cis-1.6/etcd.yaml
@@ -0,0 +1,124 @@
+---
+controls:
+version: 1.6
+id: 2
+text: "Etcd Node Configuration"
+type: "etcd"
+groups:
+  - id: 2
+    text: "Etcd Node Configuration Files"
+    checks:
+      - id: 2.1
+        text: "Ensure that the --cert-file and --key-file arguments are set as appropriate (Automated)"
+        audit: "/bin/ps -ef | /bin/grep $etcdbin | /bin/grep -v grep"
+        tests:
+          bin_op: and
+          test_items:
+            - flag: "--cert-file"
+            - flag: "--key-file"
+        remediation: |
+          Follow the etcd service documentation and configure TLS encryption.
+          Then, edit the etcd pod specification file /etc/kubernetes/manifests/etcd.yaml
+          on the master node and set the below parameters.
+          --cert-file=</path/to/ca-file>
+          --key-file=</path/to/key-file>
+        scored: true
+
+      - id: 2.2
+        text: "Ensure that the --client-cert-auth argument is set to true (Automated)"
+        audit: "/bin/ps -ef | /bin/grep $etcdbin | /bin/grep -v grep"
+        tests:
+          test_items:
+            - flag: "--client-cert-auth"
+              compare:
+                op: eq
+                value: true
+        remediation: |
+          Edit the etcd pod specification file $etcdconf on the master
+          node and set the below parameter.
+          --client-cert-auth="true"
+        scored: true
+
+      - id: 2.3
+        text: "Ensure that the --auto-tls argument is not set to true (Automated)"
+        audit: "/bin/ps -ef | /bin/grep $etcdbin | /bin/grep -v grep"
+        tests:
+          bin_op: or
+          test_items:
+            - flag: "--auto-tls"
+              set: false
+            - flag: "--auto-tls"
+              compare:
+                op: eq
+                value: false
+        remediation: |
+          Edit the etcd pod specification file $etcdconf on the master
+          node and either remove the --auto-tls parameter or set it to false.
+            --auto-tls=false
+        scored: true
+
+      - id: 2.4
+        text: "Ensure that the --peer-cert-file and --peer-key-file arguments are
+        set as appropriate (Automated)"
+        audit: "/bin/ps -ef | /bin/grep $etcdbin | /bin/grep -v grep"
+        tests:
+          bin_op: and
+          test_items:
+            - flag: "--peer-cert-file"
+            - flag: "--peer-key-file"
+        remediation: |
+          Follow the etcd service documentation and configure peer TLS encryption as appropriate
+          for your etcd cluster.
+          Then, edit the etcd pod specification file $etcdconf on the
+          master node and set the below parameters.
+          --peer-client-file=</path/to/peer-cert-file>
+          --peer-key-file=</path/to/peer-key-file>
+        scored: true
+
+      - id: 2.5
+        text: "Ensure that the --peer-client-cert-auth argument is set to true (Automated)"
+        audit: "/bin/ps -ef | /bin/grep $etcdbin | /bin/grep -v grep"
+        tests:
+          test_items:
+            - flag: "--peer-client-cert-auth"
+              compare:
+                op: eq
+                value: true
+        remediation: |
+          Edit the etcd pod specification file $etcdconf on the master
+          node and set the below parameter.
+          --peer-client-cert-auth=true
+        scored: true
+
+      - id: 2.6
+        text: "Ensure that the --peer-auto-tls argument is not set to true (Automated)"
+        audit: "/bin/ps -ef | /bin/grep $etcdbin | /bin/grep -v grep"
+        tests:
+          bin_op: or
+          test_items:
+            - flag: "--peer-auto-tls"
+              set: false
+            - flag: "--peer-auto-tls"
+              compare:
+                op: eq
+                value: false
+        remediation: |
+          Edit the etcd pod specification file $etcdconf on the master
+          node and either remove the --peer-auto-tls parameter or set it to false.
+          --peer-auto-tls=false
+        scored: true
+
+      - id: 2.7
+        text: "Ensure that a unique Certificate Authority is used for etcd (Manual)"
+        audit: "/bin/ps -ef | /bin/grep $etcdbin | /bin/grep -v grep"
+        tests:
+          test_items:
+            - flag: "--trusted-ca-file"
+        remediation: |
+          [Manual test]
+          Follow the etcd documentation and create a dedicated certificate authority setup for the
+          etcd service.
+          Then, edit the etcd pod specification file $etcdconf on the
+          master node and set the below parameter.
+          --trusted-ca-file=</path/to/ca-file>
+        scored: false
diff --git a/cfg/cis-1.4/master.yaml b/cfg/cis-1.6/master.yaml
similarity index 57%
rename from cfg/cis-1.4/master.yaml
rename to cfg/cis-1.6/master.yaml
index 4939ec6..b1bf0b5 100644
--- a/cfg/cis-1.4/master.yaml
+++ b/cfg/cis-1.6/master.yaml
@@ -1,365 +1,368 @@
 ---
 controls:
-version: 1.13
+version: 1.6
 id: 1
 text: "Master Node Security Configuration"
 type: "master"
 groups:
   - id: 1.1
-    text: "API Server"
+    text: "Master Node Configuration Files"
     checks:
       - id: 1.1.1
-        text: "Ensure that the --anonymous-auth argument is set to false (Not Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the API server pod specification file permissions are set to 644 or more restrictive (Automated)"
+        audit: "/bin/sh -c 'if test -e $apiserverconf; then stat -c permissions=%a $apiserverconf; fi'"
         tests:
           test_items:
-            - flag: "--anonymous-auth"
+            - flag: "permissions"
               compare:
-                op: eq
-                value: false
-              set: true
+                op: bitmask
+                value: "644"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --anonymous-auth=false
-        scored: false
+          Run the below command (based on the file location on your system) on the
+          master node.
+          For example, chmod 644 $apiserverconf
+        scored: true
 
       - id: 1.1.2
-        text: "Ensure that the --basic-auth-file argument is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the API server pod specification file ownership is set to root:root (Automated)"
+        audit: "/bin/sh -c 'if test -e $apiserverconf; then stat -c %U:%G $apiserverconf; fi'"
         tests:
           test_items:
-            - flag: "--basic-auth-file"
-              set: false
+            - flag: "root:root"
         remediation: |
-          Follow the documentation and configure alternate mechanisms for authentication. Then,
-          edit the API server pod specification file $apiserverconf
-          on the master node and remove the --basic-auth-file=<filename>
-          parameter.
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root $apiserverconf
         scored: true
 
       - id: 1.1.3
-        text: "Ensure that the --insecure-allow-any-token argument is not set (Not Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the controller manager pod specification file permissions are set to 644 or more restrictive (Automated)"
+        audit: "/bin/sh -c 'if test -e $controllermanagerconf; then stat -c permissions=%a $controllermanagerconf; fi'"
         tests:
           test_items:
-            - flag: "--insecure-allow-any-token"
-              set: false
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and remove the --insecure-allow-any-token
-          parameter.
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod 644 $controllermanagerconf
         scored: true
 
       - id: 1.1.4
-        text: "Ensure that the --kubelet-https argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the controller manager pod specification file ownership is set to root:root (Automated)"
+        audit: "/bin/sh -c 'if test -e $controllermanagerconf; then stat -c %U:%G $controllermanagerconf; fi'"
         tests:
-          bin_op: or
           test_items:
-            - flag: "--kubelet-https"
-              compare:
-                op: eq
-                value: true
-              set: true
-            - flag: "--kubelet-https"
-              set: false
+            - flag: "root:root"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and remove the --kubelet-https parameter.
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root $controllermanagerconf
         scored: true
 
       - id: 1.1.5
-        text: "Ensure that the --insecure-bind-address argument is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the scheduler pod specification file permissions are set to 644 or more restrictive (Automated)"
+        audit: "/bin/sh -c 'if test -e $schedulerconf; then stat -c permissions=%a $schedulerconf; fi'"
         tests:
           test_items:
-            - flag: "--insecure-bind-address"
-              set: false
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and remove the --insecure-bind-address
-          parameter.
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod 644 $schedulerconf
         scored: true
 
       - id: 1.1.6
-        text: "Ensure that the --insecure-port argument is set to 0 (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the scheduler pod specification file ownership is set to root:root (Automated)"
+        audit: "/bin/sh -c 'if test -e $schedulerconf; then stat -c %U:%G $schedulerconf; fi'"
         tests:
           test_items:
-            - flag: "--insecure-port"
-              compare:
-                op: eq
-                value: 0
-              set: true
+            - flag: "root:root"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          apiserver.yaml on the master node and set the below parameter.
-          --insecure-port=0
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root $schedulerconf
         scored: true
 
       - id: 1.1.7
-        text: "Ensure that the --secure-port argument is not set to 0 (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the etcd pod specification file permissions are set to 644 or more restrictive (Automated)"
+        audit: "/bin/sh -c 'if test -e $etcdconf; then stat -c permissions=%a $etcdconf; fi'"
         tests:
-          bin_op: or
           test_items:
-            - flag: "--secure-port"
+            - flag: "permissions"
               compare:
-                op: gt
-                value: 0
-              set: true
-            - flag: "--secure-port"
-              set: false
+                op: bitmask
+                value: "644"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and either remove the --secure-port parameter or
-          set it to a different (non-zero) desired port.
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod 644 $etcdconf
         scored: true
 
       - id: 1.1.8
-        text: "Ensure that the --profiling argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the etcd pod specification file ownership is set to root:root (Automated)"
+        audit: "/bin/sh -c 'if test -e $etcdconf; then stat -c %U:%G $etcdconf; fi'"
         tests:
           test_items:
-            - flag: "--profiling"
-              compare:
-                op: eq
-                value: false
-              set: true
+            - flag: "root:root"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --profiling=false
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root $etcdconf
         scored: true
 
       - id: 1.1.9
-        text: "Ensure that the --repair-malformed-updates argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--repair-malformed-updates"
-              compare:
-                op: eq
-                value: false
-              set: true
+        text: "Ensure that the Container Network Interface file permissions are set to 644 or more restrictive (Manual)"
+        audit: "stat -c permissions=%a <path/to/cni/files>"
+        type: "manual"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --repair-malformed-updates=false
-        scored: true
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod 644 <path/to/cni/files>
+        scored: false
 
       - id: 1.1.10
-        text: "Ensure that the admission control plugin AlwaysAdmit is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: nothave
-                value: AlwaysAdmit
-              set: true
-            - flag: "--enable-admission-plugins"
-              set: false
+        text: "Ensure that the Container Network Interface file ownership is set to root:root (Manual)"
+        audit: "stat -c %U:%G <path/to/cni/files>"
+        type: "manual"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that does not include AlwaysAdmit.
-        scored: true
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root <path/to/cni/files>
+        scored: false
 
       - id: 1.1.11
-        text: "Ensure that the admission control plugin AlwaysPullImages is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the etcd data directory permissions are set to 700 or more restrictive (Automated)"
+        audit: ps -ef | grep $etcdbin | grep -- --data-dir | sed 's%.*data-dir[= ]\([^ ]*\).*%\1%' | xargs stat -c permissions=%a
         tests:
           test_items:
-            - flag: "--enable-admission-plugins"
+            - flag: "permissions"
               compare:
-                op: has
-                value: "AlwaysPullImages"
-              set: true
+                op: bitmask
+                value: "700"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins to
-          include AlwaysPullImages.
-          --enable-admission-plugins=...,AlwaysPullImages,...
+          On the etcd server node, get the etcd data directory, passed as an argument --data-dir,
+          from the below command:
+          ps -ef | grep etcd
+          Run the below command (based on the etcd data directory found above). For example,
+          chmod 700 /var/lib/etcd
         scored: true
 
       - id: 1.1.12
-        text: "[DEPRECATED] Ensure that the admission control plugin DenyEscalatingExec is set (Not Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        type: "skip"
+        text: "Ensure that the etcd data directory ownership is set to etcd:etcd (Automated)"
+        audit: ps -ef | grep $etcdbin | grep -- --data-dir | sed 's%.*data-dir[= ]\([^ ]*\).*%\1%' | xargs stat -c %U:%G
         tests:
           test_items:
-            - flag: "--enable-admission-plugins"
-              compare:
-                op: has
-                value: "DenyEscalatingExec"
-              set: true
+            - flag: "etcd:etcd"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that includes DenyEscalatingExec.
-          --enable-admission-plugins=...,DenyEscalatingExec,...
-        scored: false
+          On the etcd server node, get the etcd data directory, passed as an argument --data-dir,
+          from the below command:
+          ps -ef | grep etcd
+          Run the below command (based on the etcd data directory found above).
+          For example, chown etcd:etcd /var/lib/etcd
+        scored: true
 
       - id: 1.1.13
-        text: "Ensure that the admission control plugin SecurityContextDeny is set (Not Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the admin.conf file permissions are set to 644 or more restrictive (Automated)"
+        audit: "/bin/sh -c 'if test -e /etc/kubernetes/admin.conf; then stat -c permissions=%a /etc/kubernetes/admin.conf; fi'"
         tests:
           test_items:
-            - flag: "--enable-admission-plugins"
+            - flag: "permissions"
               compare:
-                op: has
-                value: "SecurityContextDeny"
-              set: true
+                op: bitmask
+                value: "644"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to
-          include SecurityContextDeny.
-          --enable-admission-plugins=...,SecurityContextDeny,...
-        scored: false
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod 644 /etc/kubernetes/admin.conf
+        scored: true
 
       - id: 1.1.14
-        text: "Ensure that the admission control plugin NamespaceLifecycle is set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the admin.conf file ownership is set to root:root (Automated)"
+        audit: "/bin/sh -c 'if test -e /etc/kubernetes/admin.conf; then stat -c %U:%G /etc/kubernetes/admin.conf; fi'"
         tests:
-          bin_op: or
           test_items:
-            - flag: "--disable-admission-plugins"
-              compare:
-                op: nothave
-                value: "NamespaceLifecycle"
-              set: true
-            - flag: "--disable-admission-plugins"
-              set: false
+            - flag: "root:root"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --disable-admission-plugins parameter to
-          ensure it does not include NamespaceLifecycle.
-          --disable-admission-plugins=...,NamespaceLifecycle,...
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root /etc/kubernetes/admin.conf
         scored: true
 
       - id: 1.1.15
-        text: "Ensure that the --audit-log-path argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the scheduler.conf file permissions are set to 644 or more restrictive (Automated)"
+        audit: "/bin/sh -c 'if test -e /etc/kubernetes/scheduler.conf; then stat -c permissions=%a /etc/kubernetes/scheduler.conf; fi'"
         tests:
           test_items:
-            - flag: "--audit-log-path"
-              set: true
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-path parameter to a suitable
-          path and file where you would like audit logs to be written, for example:
-          --audit-log-path=/var/log/apiserver/audit.log
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod 644 /etc/kubernetes/scheduler.conf
         scored: true
 
       - id: 1.1.16
-        text: "Ensure that the --audit-log-maxage argument is set to 30 or as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the scheduler.conf file ownership is set to root:root (Automated)"
+        audit: "/bin/sh -c 'if test -e /etc/kubernetes/scheduler.conf; then stat -c %U:%G /etc/kubernetes/scheduler.conf; fi'"
         tests:
           test_items:
-            - flag: "--audit-log-maxage"
-              compare:
-                op: gte
-                value: 30
-              set: true
+            - flag: "root:root"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-maxage parameter to 30 or
-          as an appropriate number of days: --audit-log-maxage=30
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root /etc/kubernetes/scheduler.conf
         scored: true
 
       - id: 1.1.17
-        text: "Ensure that the --audit-log-maxbackup argument is set to 10 or as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the controller-manager.conf file permissions are set to 644 or more restrictive (Automated)"
+        audit: "/bin/sh -c 'if test -e /etc/kubernetes/controller-manager.conf; then stat -c permissions=%a /etc/kubernetes/controller-manager.conf; fi'"
         tests:
           test_items:
-            - flag: "--audit-log-maxbackup"
+            - flag: "permissions"
               compare:
-                op: gte
-                value: 10
-              set: true
+                op: bitmask
+                value: "644"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-maxbackup parameter to 10
-          or to an appropriate value.
-          --audit-log-maxbackup=10
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod 644 /etc/kubernetes/controller-manager.conf
         scored: true
 
       - id: 1.1.18
-        text: "Ensure that the --audit-log-maxsize argument is set to 100 or as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the controller-manager.conf file ownership is set to root:root (Automated)"
+        audit: "/bin/sh -c 'if test -e /etc/kubernetes/controller-manager.conf; then stat -c %U:%G /etc/kubernetes/controller-manager.conf; fi'"
         tests:
           test_items:
-            - flag: "--audit-log-maxsize"
-              compare:
-                op: gte
-                value: 100
-              set: true
+            - flag: "root:root"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --audit-log-maxsize parameter to an
-          appropriate size in MB. For example, to set it as 100 MB:
-          --audit-log-maxsize=100
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown root:root /etc/kubernetes/controller-manager.conf
         scored: true
 
       - id: 1.1.19
-        text: "Ensure that the --authorization-mode argument is not set to AlwaysAllow (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the Kubernetes PKI directory and file ownership is set to root:root (Automated)"
+        audit: "find /etc/kubernetes/pki/ | xargs stat -c %U:%G"
+        use_multiple_values: true
         tests:
           test_items:
-            - flag: "--authorization-mode"
-              compare:
-                op: nothave
-                value: "AlwaysAllow"
-              set: true
+            - flag: "root root"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --authorization-mode parameter to
-          values other than AlwaysAllow. One such example could be as below.
-          --authorization-mode=RBAC
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chown -R root:root /etc/kubernetes/pki/
         scored: true
 
       - id: 1.1.20
-        text: "Ensure that the --token-auth-file parameter is not set (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        text: "Ensure that the Kubernetes PKI certificate file permissions are set to 644 or more restrictive (Manual)"
+        audit: "find /etc/kubernetes/pki -name '*.crt' | xargs stat -c permissions=%a"
+        use_multiple_values: true
         tests:
           test_items:
-            - flag: "--token-auth-file"
-              set: false
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
+        remediation: |
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod -R 644 /etc/kubernetes/pki/*.crt
+        scored: false
+
+      - id: 1.1.21
+        text: "Ensure that the Kubernetes PKI key file permissions are set to 600 (Manual)"
+        audit: "find /etc/kubernetes/pki -name '*.key' | xargs stat -c permissions=%a"
+        use_multiple_values: true
+        tests:
+          test_items:
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "600"
+        remediation: |
+          Run the below command (based on the file location on your system) on the master node.
+          For example,
+          chmod -R 600 /etc/kubernetes/pki/*.key
+        scored: false
+
+  - id: 1.2
+    text: "API Server"
+    checks:
+      - id: 1.2.1
+        text: "Ensure that the --anonymous-auth argument is set to false (Manual)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        type: manual
+        tests:
+          test_items:
+            - flag: "--anonymous-auth"
+              compare:
+                op: eq
+                value: false
+        remediation: |
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the below parameter.
+          --anonymous-auth=false
+        scored: false
+
+      - id: 1.2.2
+        text: "Ensure that the --basic-auth-file argument is not set (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        tests:
+          test_items:
+            - flag: "--basic-auth-file"
+              set: false
         remediation: |
           Follow the documentation and configure alternate mechanisms for authentication. Then,
           edit the API server pod specification file $apiserverconf
-          on the master node and remove the --token-auth-file=<filename>
-          parameter.
+          on the master node and remove the --basic-auth-file=<filename> parameter.
         scored: true
 
-      - id: 1.1.21
-        text: "Ensure that the --kubelet-certificate-authority argument is set as appropriate (Scored)"
+      - id: 1.2.3
+        text: "Ensure that the --token-auth-file parameter is not set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--kubelet-certificate-authority"
-              set: true
+            - flag: "--token-auth-file"
+              set: false
         remediation: |
-          Follow the Kubernetes documentation and setup the TLS connection between the
-          apiserver and kubelets. Then, edit the API server pod specification file
-          $apiserverconf on the master node and set the --kubelet-certificate-authority
-          parameter to the path to the cert file for the certificate authority.
-          --kubelet-certificate-authority=<ca-string>
+          Follow the documentation and configure alternate mechanisms for authentication. Then,
+          edit the API server pod specification file $apiserverconf
+          on the master node and remove the --token-auth-file=<filename> parameter.
+        scored: true
+
+      - id: 1.2.4
+        text: "Ensure that the --kubelet-https argument is set to true (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        tests:
+          bin_op: or
+          test_items:
+            - flag: "--kubelet-https"
+              compare:
+                op: eq
+                value: true
+            - flag: "--kubelet-https"
+              set: false
+        remediation: |
+          Edit the API server pod specification file $apiserverconf
+          on the master node and remove the --kubelet-https parameter.
         scored: true
 
-      - id: 1.1.22
-        text: "Ensure that the --kubelet-client-certificate and --kubelet-client-key arguments are set as appropriate (Scored)"
+      - id: 1.2.5
+        text: "Ensure that the --kubelet-client-certificate and --kubelet-client-key arguments are set as appropriate (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           bin_op: and
           test_items:
             - flag: "--kubelet-client-certificate"
-              set: true
             - flag: "--kubelet-client-key"
-              set: true
         remediation: |
           Follow the Kubernetes documentation and set up the TLS connection between the
           apiserver and kubelets. Then, edit API server pod specification file
@@ -369,183 +372,196 @@ groups:
           --kubelet-client-key=<path/to/client-key-file>
         scored: true
 
-      - id: 1.1.23
-        text: "Ensure that the --service-account-lookup argument is set to true (Scored)"
+      - id: 1.2.6
+        text: "Ensure that the --kubelet-certificate-authority argument is set as appropriate (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
-          bin_op: or
           test_items:
-            - flag: "--service-account-lookup"
-              set: false
-            - flag: "--service-account-lookup"
+            - flag: "--kubelet-certificate-authority"
+        remediation: |
+          Follow the Kubernetes documentation and setup the TLS connection between
+          the apiserver and kubelets. Then, edit the API server pod specification file
+          $apiserverconf on the master node and set the
+          --kubelet-certificate-authority parameter to the path to the cert file for the certificate authority.
+          --kubelet-certificate-authority=<ca-string>
+        scored: true
+
+      - id: 1.2.7
+        text: "Ensure that the --authorization-mode argument is not set to AlwaysAllow (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
+        tests:
+          test_items:
+            - flag: "--authorization-mode"
               compare:
-                op: eq
-                value: true
-              set: true
+                op: nothave
+                value: "AlwaysAllow"
         remediation: |
           Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --service-account-lookup=true
+          on the master node and set the --authorization-mode parameter to values other than AlwaysAllow.
+          One such example could be as below.
+          --authorization-mode=RBAC
         scored: true
 
-      - id: 1.1.24
-        text: "Ensure that the admission control plugin PodSecurityPolicy is set (Scored)"
+      - id: 1.2.8
+        text: "Ensure that the --authorization-mode argument includes Node (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--enable-admission-plugins"
+            - flag: "--authorization-mode"
               compare:
                 op: has
-                value: "PodSecurityPolicy"
-              set: true
+                value: "Node"
         remediation: |
-          Follow the documentation and create Pod Security Policy objects as per your environment.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that includes PodSecurityPolicy :
-          --enable-admission-plugins=...,PodSecurityPolicy,...
-          Then restart the API Server.
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the --authorization-mode parameter to a value that includes Node.
+          --authorization-mode=Node,RBAC
         scored: true
 
-      - id: 1.1.25
-        text: "Ensure that the --service-account-key-file argument is set as appropriate (Scored)"
+      - id: 1.2.9
+        text: "Ensure that the --authorization-mode argument includes RBAC (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--service-account-key-file"
-              set: true
+            - flag: "--authorization-mode"
+              compare:
+                op: has
+                value: "RBAC"
         remediation: |
           Edit the API server pod specification file $apiserverconf
-          on the master node and set the --service-account-key-file parameter
-          to the public key file for service accounts:
-          --service-account-key-file=<filename>
+          on the master node and set the --authorization-mode parameter to a value that includes RBAC,
+          for example:
+          --authorization-mode=Node,RBAC
         scored: true
 
-      - id: 1.1.26
-        text: "Ensure that the --etcd-certfile and --etcd-keyfile arguments are set as
-          appropriate (Scored)"
+      - id: 1.2.10
+        text: "Ensure that the admission control plugin EventRateLimit is set (Manual)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
-          bin_op: and
           test_items:
-            - flag: "--etcd-certfile"
-              set: true
-            - flag: "--etcd-keyfile"
-              set: true
+            - flag: "--enable-admission-plugins"
+              compare:
+                op: has
+                value: "EventRateLimit"
         remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection between the
-          apiserver and etcd. Then, edit the API server pod specification file
-          $apiserverconf on the master node and set the etcd
-          certificate and key file parameters.
-          --etcd-certfile=<path/to/client-certificate-file>
-          --etcd-keyfile=<path/to/client-key-file>
-        scored: true
+          Follow the Kubernetes documentation and set the desired limits in a configuration file.
+          Then, edit the API server pod specification file $apiserverconf
+          and set the below parameters.
+          --enable-admission-plugins=...,EventRateLimit,...
+          --admission-control-config-file=<path/to/configuration/file>
+        scored: false
 
-      - id: 1.1.27
-        text: "Ensure that the admission control plugin ServiceAccount is set(Scored)"
+      - id: 1.2.11
+        text: "Ensure that the admission control plugin AlwaysAdmit is not set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           bin_op: or
           test_items:
-            - flag: "--disable-admission-plugins"
+            - flag: "--enable-admission-plugins"
               compare:
                 op: nothave
-                value: "ServiceAccount"
-              set: true
-            - flag: "--disable-admission-plugins"
+                value: AlwaysAdmit
+            - flag: "--enable-admission-plugins"
               set: false
         remediation: |
-          Follow the documentation and create ServiceAccount objects as per your environment.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the --enable-admission-plugins parameter to a
-          value that includes ServiceAccount.
-          --enable-admission-plugins=...,ServiceAccount,...
+          Edit the API server pod specification file $apiserverconf
+          on the master node and either remove the --enable-admission-plugins parameter, or set it to a
+          value that does not include AlwaysAdmit.
         scored: true
 
-      - id: 1.1.28
-        text: "Ensure that the --tls-cert-file and --tls-private-key-file arguments are set
-        as appropriate (Scored)"
+      - id: 1.2.12
+        text: "Ensure that the admission control plugin AlwaysPullImages is set (Manual)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
-          bin_op: and
           test_items:
-            - flag: "--tls-cert-file"
-              set: true
-            - flag: "--tls-private-key-file"
-              set: true
+            - flag: "--enable-admission-plugins"
+              compare:
+                op: has
+                value: "AlwaysPullImages"
         remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection on the apiserver.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the TLS certificate and private key file
-          parameters.
-          --tls-cert-file=<path/to/tls-certificate-file>
-          --tls-private-key-file=<path/to/tls-key-file>
-        scored: true
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the --enable-admission-plugins parameter to include
+          AlwaysPullImages.
+          --enable-admission-plugins=...,AlwaysPullImages,...
+        scored: false
 
-      - id: 1.1.29
-        text: "Ensure that the --client-ca-file argument is set as appropriate (Scored)"
+      - id: 1.2.13
+        text: "Ensure that the admission control plugin SecurityContextDeny is set if PodSecurityPolicy is not used (Manual)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
+          bin_op: or
           test_items:
-            - flag: "--client-ca-file"
-              set: true
+            - flag: "--enable-admission-plugins"
+              compare:
+                op: has
+                value: "SecurityContextDeny"
+            - flag: "--enable-admission-plugins"
+              compare:
+                op: has
+                value: "PodSecurityPolicy"
         remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection on the apiserver.
-          Then, edit the API server pod specification file $apiserverconf
-          on the master node and set the client certificate authority file.
-          --client-ca-file=<path/to/client-ca-file>
-        scored: true
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the --enable-admission-plugins parameter to include
+          SecurityContextDeny, unless PodSecurityPolicy is already in place.
+          --enable-admission-plugins=...,SecurityContextDeny,...
+        scored: false
 
-      - id: 1.1.30
-        text: "Ensure that the --etcd-cafile argument is set as appropriate (Scored)"
+      - id: 1.2.14
+        text: "Ensure that the admission control plugin ServiceAccount is set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
+          bin_op: or
           test_items:
-            - flag: "--etcd-cafile"
-              set: true
+            - flag: "--disable-admission-plugins"
+              compare:
+                op: nothave
+                value: "ServiceAccount"
+            - flag: "--disable-admission-plugins"
+              set: false
         remediation: |
-          Follow the Kubernetes documentation and set up the TLS connection between the
-          apiserver and etcd. Then, edit the API server pod specification file
-          $apiserverconf on the master node and set the etcd
-          certificate authority file parameter.
-          --etcd-cafile=<path/to/ca-file>
+          Follow the documentation and create ServiceAccount objects as per your environment.
+          Then, edit the API server pod specification file $apiserverconf
+          on the master node and ensure that the --disable-admission-plugins parameter is set to a
+          value that does not include ServiceAccount.
         scored: true
 
-      - id: 1.1.31
-        text: "Ensure that the API Server only makes use of Strong Cryptographic Ciphers (Not Scored)"
+      - id: 1.2.15
+        text: "Ensure that the admission control plugin NamespaceLifecycle is set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
+          bin_op: or
           test_items:
-            - flag: "--tls-cipher-suites"
+            - flag: "--disable-admission-plugins"
               compare:
-                op: has
-                value: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256"
-              set: true
+                op: nothave
+                value: "NamespaceLifecycle"
+            - flag: "--disable-admission-plugins"
+              set: false
         remediation: |
           Edit the API server pod specification file $apiserverconf
-          on the master node and set the below parameter.
-          --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
-        scored: false
+          on the master node and set the --disable-admission-plugins parameter to
+          ensure it does not include NamespaceLifecycle.
+        scored: true
 
-      - id: 1.1.32
-        text: "Ensure that the --authorization-mode argument is set to Node (Scored)"
+      - id: 1.2.16
+        text: "Ensure that the admission control plugin PodSecurityPolicy is set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--authorization-mode"
+            - flag: "--enable-admission-plugins"
               compare:
                 op: has
-                value: "Node"
-              set: true
+                value: "PodSecurityPolicy"
         remediation: |
-          Edit the API server pod specification file $apiserverconf
-          on the master node and set the --authorization-mode parameter to a
-          value that includes Node.
-          --authorization-mode=Node,RBAC
+          Follow the documentation and create Pod Security Policy objects as per your environment.
+          Then, edit the API server pod specification file $apiserverconf
+          on the master node and set the --enable-admission-plugins parameter to a
+          value that includes PodSecurityPolicy:
+          --enable-admission-plugins=...,PodSecurityPolicy,...
+          Then restart the API Server.
         scored: true
 
-      - id: 1.1.33
-        text: "Ensure that the admission control plugin NodeRestriction is set (Scored)"
+      - id: 1.2.17
+        text: "Ensure that the admission control plugin NodeRestriction is set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
@@ -553,915 +569,414 @@ groups:
               compare:
                 op: has
                 value: "NodeRestriction"
-              set: true
         remediation: |
-          Follow the Kubernetes documentation and configure NodeRestriction plug-in on
-          kubelets. Then, edit the API server pod specification file $apiserverconf
+          Follow the Kubernetes documentation and configure NodeRestriction plug-in on kubelets.
+          Then, edit the API server pod specification file $apiserverconf
           on the master node and set the --enable-admission-plugins parameter to a
           value that includes NodeRestriction.
           --enable-admission-plugins=...,NodeRestriction,...
         scored: true
 
-      - id: 1.1.34
-        text: "Ensure that the --encryption-provider-config argument is set as appropriate (Scored)"
+      - id: 1.2.18
+        text: "Ensure that the --insecure-bind-address argument is not set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--encryption-provider-config"
-              set: true
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and configure a EncryptionConfig file.
-          Then, edit the API server pod specification file $apiserverconf on the
-          master node and set the --encryption-provider-config parameter
-          to the path of that file:
-          --encryption-provider-config=</path/to/EncryptionConfig/File>
-        scored: true
-
-      - id: 1.1.35
-        text: "Ensure that the encryption provider is set to aescbc (Scored)"
-        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
-        type: "manual"
+            - flag: "--insecure-bind-address"
+              set: false
         remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and configure a EncryptionConfig file. In this file,
-          choose aescbc as the encryption provider.
-          For example,
-          kind: EncryptionConfig
-          apiVersion: v1
-          resources:
-            - resources:
-              - secrets
-                providers:
-                - aescbc:
-                    keys:
-                    - name: key1
-                      secret: <32-byte base64-encoded secret>
+          Edit the API server pod specification file $apiserverconf
+          on the master node and remove the --insecure-bind-address parameter.
         scored: true
 
-      - id: 1.1.36
-        text: "Ensure that the admission control plugin EventRateLimit is set (Scored)"
+      - id: 1.2.19
+        text: "Ensure that the --insecure-port argument is set to 0 (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--enable-admission-plugins"
+            - flag: "--insecure-port"
               compare:
-                op: has
-                value: "EventRateLimit"
-              set: true
+                op: eq
+                value: 0
         remediation: |
-          Follow the Kubernetes documentation and set the desired limits in a
-          configuration file. Then, edit the API server pod specification file
-          $apiserverconf and set the below parameters.
-          --enable-admission-plugins=...,EventRateLimit,...
-          --admission-control-config-file=<path/to/configuration/file>
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the below parameter.
+          --insecure-port=0
         scored: true
 
-      - id: 1.1.37a
-        text: "Ensure that the AdvancedAuditing argument is not set to false (Scored)"
+      - id: 1.2.20
+        text: "Ensure that the --secure-port argument is not set to 0 (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           bin_op: or
           test_items:
-            - flag: "--feature-gates"
+            - flag: "--secure-port"
               compare:
-                op: nothave
-                value: "AdvancedAuditing=false"
-              set: true
-            - flag: "--feature-gates"
+                op: gt
+                value: 0
+            - flag: "--secure-port"
               set: false
         remediation: |
-          Follow the Kubernetes documentation and set the desired audit policy in the
-          /etc/kubernetes/audit-policy.yaml file. Then, edit the API server pod specification file $apiserverconf
-          and set the below parameters.
-          --audit-policy-file=/etc/kubernetes/audit-policy.yaml
+          Edit the API server pod specification file $apiserverconf
+          on the master node and either remove the --secure-port parameter or
+          set it to a different (non-zero) desired port.
         scored: true
 
-      - id: 1.1.37b
-        text: "Ensure that the AdvancedAuditing argument is not set to false (Scored)"
+      - id: 1.2.21
+        text: "Ensure that the --profiling argument is set to false (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
-          bin_op: or
           test_items:
-            - flag: "--audit-policy-file"
-              compare:
-                op: eq
-                value: "/etc/kubernetes/audit-policy.yaml"
-              set: true
-            - flag: "--audit-policy-file"
+            - flag: "--profiling"
               compare:
                 op: eq
-                value: "/etc/kubernetes/audit-policy.yml"
-              set: true
+                value: false
         remediation: |
-          Follow the Kubernetes documentation and set the desired audit policy in the
-          /etc/kubernetes/audit-policy.yaml file. Then, edit the API server pod specification file $apiserverconf
-          and set the below parameters.
-          --audit-policy-file=/etc/kubernetes/audit-policy.yaml
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the below parameter.
+          --profiling=false
         scored: true
 
-      - id: 1.1.38
-        text: "Ensure that the --request-timeout argument is set as appropriate (Scored)"
+      - id: 1.2.22
+        text: "Ensure that the --audit-log-path argument is set (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
-          bin_op: or
           test_items:
-            - flag: "--request-timeout"
-              set: false
-            - flag: "--request-timeout"
-              set: true
+            - flag: "--audit-log-path"
         remediation: |
           Edit the API server pod specification file $apiserverconf
-          and set the below parameter as appropriate and if needed. For example,
-          --request-timeout=300s
+          on the master node and set the --audit-log-path parameter to a suitable path and
+          file where you would like audit logs to be written, for example:
+          --audit-log-path=/var/log/apiserver/audit.log
         scored: true
 
-      - id: 1.1.39
-        text: "Ensure that the --authorization-mode argument includes RBAC (Scored)"
+      - id: 1.2.23
+        text: "Ensure that the --audit-log-maxage argument is set to 30 or as appropriate (Automated)"
         audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--authorization-mode"
+            - flag: "--audit-log-maxage"
               compare:
-                op: has
-                value: "RBAC"
-              set: true
+                op: gte
+                value: 30
         remediation: |
-          Edit the API server pod specification file $apiserverbin on the master node and set the --authorization-mode parameter to a value that includes RBAC, for example: --authorization-mode=Node,RBAC
-        scored: true
-
-  - id: 1.2
-    text: "Scheduler"
-    checks:
-      - id: 1.2.1
-        text: "Ensure that the --profiling argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $schedulerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--profiling"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the Scheduler pod specification file $schedulerconf
-          file on the master node and set the below parameter.
-          --profiling=false
-        scored: true
-
-      - id: 1.2.2
-        text: "Ensure that the --address argument is set to 127.0.0.1 (Scored)"
-        audit: "/bin/ps -ef | grep $schedulerbin | grep -v grep"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "--address"
-              compare:
-                op: eq
-                value: "127.0.0.1"
-              set: true
-            - flag: "--address"
-              set: false
-        remediation: |
-          Edit the Scheduler pod specification file $schedulerconf
-          file on the master node and ensure the correct value for the
-          --address parameter.
-        scored: true
-
-  - id: 1.3
-    text: "Controller Manager"
-    checks:
-      - id: 1.3.1
-        text: "Ensure that the --terminated-pod-gc-threshold argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--terminated-pod-gc-threshold"
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the --terminated-pod-gc-threshold to an appropriate threshold, for example:
-          --terminated-pod-gc-threshold=10
-        scored: true
-
-      - id: 1.3.2
-        text: "Ensure that the --profiling argument is set to false (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--profiling"
-              compare:
-                op: eq
-                value: false
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the below parameter.
-          --profiling=false
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the --audit-log-maxage parameter to 30 or as an appropriate number of days:
+          --audit-log-maxage=30
         scored: true
 
-      - id: 1.3.3
-        text: "Ensure that the --use-service-account-credentials argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
+      - id: 1.2.24
+        text: "Ensure that the --audit-log-maxbackup argument is set to 10 or as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--use-service-account-credentials"
+            - flag: "--audit-log-maxbackup"
               compare:
-                op: noteq
-                value: false
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node to set the below parameter.
-          --use-service-account-credentials=true
-        scored: true
-
-      - id: 1.3.4
-        text: "Ensure that the --service-account-private-key-file argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--service-account-private-key-file"
-              set: true
-        remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the --service-account-private-
-          key-file parameter to the private key file for service accounts.
-          --service-account-private-key-file=<filename>
-        scored: true
-
-      - id: 1.3.5
-        text: "Ensure that the --root-ca-file argument is set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--root-ca-file"
-              set: true
+                op: gte
+                value: 10
         remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          on the master node and set the --root-ca-file parameter to
-          the certificate bundle file.
-          --root-ca-file=<path/to/file>
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the --audit-log-maxbackup parameter to 10 or to an appropriate
+          value.
+          --audit-log-maxbackup=10
         scored: true
 
-      - id: 1.3.6
-        text: "Ensure that the RotateKubeletServerCertificate argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
+      - id: 1.2.25
+        text: "Ensure that the --audit-log-maxsize argument is set to 100 or as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "--feature-gates"
+            - flag: "--audit-log-maxsize"
               compare:
-                op: eq
-                value: "RotateKubeletServerCertificate=true"
-              set: true
+                op: gte
+                value: 100
         remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          controller-manager.yaml on the master node and set the --feature-gates parameter to
-          include RotateKubeletServerCertificate=true.
-          --feature-gates=RotateKubeletServerCertificate=true
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the --audit-log-maxsize parameter to an appropriate size in MB.
+          For example, to set it as 100 MB:
+          --audit-log-maxsize=100
         scored: true
 
-      - id: 1.3.7
-        text: "Ensure that the --address argument is set to 127.0.0.1 (Scored)"
-        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
+      - id: 1.2.26
+        text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           bin_op: or
           test_items:
-            - flag: "--address"
-              compare:
-                op: eq
-                value: "127.0.0.1"
-              set: true
-            - flag: "--address"
+            - flag: "--request-timeout"
               set: false
+            - flag: "--request-timeout"
         remediation: |
-          Edit the Controller Manager pod specification file $controllermanagerconf
-          controller-manager.yaml on the master node and ensure the correct value
-          for the --address parameter.
-        scored: true
-
-  - id: 1.4
-    text: "Configuration Files"
-    checks:
-      - id: 1.4.1
-        text: "Ensure that the API server pod specification file permissions are
-        set to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $apiserverconf; then stat -c permissions=%a $apiserverconf; fi'"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
+          Edit the API server pod specification file $apiserverconf
+          and set the below parameter as appropriate and if needed.
           For example,
-          chmod 644 $apiserverconf
+          --request-timeout=300s
         scored: true
 
-      - id: 1.4.2
-        text: "Ensure that the API server pod specification file ownership is set to
-        root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $apiserverconf; then stat -c %U:%G $apiserverconf; fi'"
+      - id: 1.2.27
+        text: "Ensure that the --service-account-lookup argument is set to true (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
+          bin_op: or
           test_items:
-            - flag: "root:root"
+            - flag: "--service-account-lookup"
+              set: false
+            - flag: "--service-account-lookup"
               compare:
                 op: eq
-                value: "root:root"
-              set: true
+                value: true
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $apiserverconf
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the below parameter.
+          --service-account-lookup=true
+          Alternatively, you can delete the --service-account-lookup parameter from this file so
+          that the default takes effect.
         scored: true
 
-      - id: 1.4.3
-        text: "Ensure that the controller manager pod specification file
-        permissions are set to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $controllermanagerconf; then stat -c permissions=%a $controllermanagerconf; fi'"
+      - id: 1.2.28
+        text: "Ensure that the --service-account-key-file argument is set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
+            - flag: "--service-account-key-file"
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 $controllermanagerconf
+          Edit the API server pod specification file $apiserverconf
+          on the master node and set the --service-account-key-file parameter
+          to the public key file for service accounts:
+          --service-account-key-file=<filename>
         scored: true
 
-      - id: 1.4.4
-        text: "Ensure that the controller manager pod specification file
-        ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $controllermanagerconf; then stat -c %U:%G $controllermanagerconf; fi'"
+      - id: 1.2.29
+        text: "Ensure that the --etcd-certfile and --etcd-keyfile arguments are set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
+          bin_op: and
           test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
+            - flag: "--etcd-certfile"
+            - flag: "--etcd-keyfile"
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $controllermanagerconf
+          Follow the Kubernetes documentation and set up the TLS connection between the apiserver and etcd.
+          Then, edit the API server pod specification file $apiserverconf
+          on the master node and set the etcd certificate and key file parameters.
+          --etcd-certfile=<path/to/client-certificate-file>
+          --etcd-keyfile=<path/to/client-key-file>
         scored: true
 
-      - id: 1.4.5
-        text: "Ensure that the scheduler pod specification file permissions are set
-        to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $schedulerconf; then stat -c permissions=%a $schedulerconf; fi'"
+      - id: 1.2.30
+        text: "Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
+          bin_op: and
           test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
+            - flag: "--tls-cert-file"
+            - flag: "--tls-private-key-file"
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 $schedulerconf
+          Follow the Kubernetes documentation and set up the TLS connection on the apiserver.
+          Then, edit the API server pod specification file $apiserverconf
+          on the master node and set the TLS certificate and private key file parameters.
+          --tls-cert-file=<path/to/tls-certificate-file>
+          --tls-private-key-file=<path/to/tls-key-file>
         scored: true
 
-      - id: 1.4.6
-        text: "Ensure that the scheduler pod specification file ownership is set to
-        root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $schedulerconf; then stat -c %U:%G $schedulerconf; fi'"
+      - id: 1.2.31
+        text: "Ensure that the --client-ca-file argument is set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
+            - flag: "--client-ca-file"
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $schedulerconf
+          Follow the Kubernetes documentation and set up the TLS connection on the apiserver.
+          Then, edit the API server pod specification file $apiserverconf
+          on the master node and set the client certificate authority file.
+          --client-ca-file=<path/to/client-ca-file>
         scored: true
 
-      - id: 1.4.7
-        text: "Ensure that the etcd pod specification file permissions are set to
-        644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e $etcdconf; then stat -c permissions=%a $etcdconf; fi'"
+      - id: 1.2.32
+        text: "Ensure that the --etcd-cafile argument is set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
+            - flag: "--etcd-cafile"
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 $etcdconf
+          Follow the Kubernetes documentation and set up the TLS connection between the apiserver and etcd.
+          Then, edit the API server pod specification file $apiserverconf
+          on the master node and set the etcd certificate authority file parameter.
+          --etcd-cafile=<path/to/ca-file>
         scored: true
 
-      - id: 1.4.8
-        text: "Ensure that the etcd pod specification file ownership is set to
-        root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e $etcdconf; then stat -c %U:%G $etcdconf; fi'"
+      - id: 1.2.33
+        text: "Ensure that the --encryption-provider-config argument is set as appropriate (Manual)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root $etcdconf
-        scored: true
-
-      - id: 1.4.9
-        text: "Ensure that the Container Network Interface file permissions are
-        set to 644 or more restrictive (Not Scored)"
-        audit: "stat -c permissions=%a <path/to/cni/files>"
-        type: "manual"
+            - flag: "--encryption-provider-config"
         remediation: |
-          [Manual test]
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 <path/to/cni/files>
-        scored: true
+          Follow the Kubernetes documentation and configure a EncryptionConfig file.
+          Then, edit the API server pod specification file $apiserverconf
+          on the master node and set the --encryption-provider-config parameter to the path of that file: --encryption-provider-config=</path/to/EncryptionConfig/File>
+        scored: false
 
-      - id: 1.4.10
-        text: "Ensure that the Container Network Interface file ownership is set
-        to root:root (Not Scored)"
-        audit: "stat -c %U:%G <path/to/cni/files>"
+      - id: 1.2.34
+        text: "Ensure that encryption providers are appropriately configured (Manual)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         type: "manual"
         remediation: |
-          [Manual test]
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root <path/to/cni/files>
-        scored: true
+          Follow the Kubernetes documentation and configure a EncryptionConfig file.
+          In this file, choose aescbc, kms or secretbox as the encryption provider.
+        scored: false
 
-      - id: 1.4.11
-        text: "Ensure that the etcd data directory permissions are set to 700 or more restrictive (Scored)"
-        audit: ps -ef | grep $etcdbin | grep -- --data-dir | sed 's%.*data-dir[= ]\([^ ]*\).*%\1%' | xargs stat -c permissions=%a
+      - id: 1.2.35
+        text: "Ensure that the API Server only makes use of Strong Cryptographic Ciphers (Manual)"
+        audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
         tests:
           test_items:
-            - flag: "permissions"
+            - flag: "--tls-cipher-suites"
               compare:
-                op: bitmask
-                value: "700"
-              set: true
-        remediation: |
-          On the etcd server node, get the etcd data directory, passed as an argument --data-dir ,
-          from the below command:
-          ps -ef | grep $etcdbin
-          Run the below command (based on the etcd data directory found above). For example,
-          chmod 700 /var/lib/etcd
-        scored: true
-
-      - id: 1.4.12
-        text: "Ensure that the etcd data directory ownership is set to etcd:etcd (Scored)"
-        audit: ps -ef | grep $etcdbin | grep -- --data-dir | sed 's%.*data-dir[= ]\([^ ]*\).*%\1%' | xargs stat -c %U:%G
-        tests:
-          test_items:
-            - flag: "etcd:etcd"
-              set: true
+                op: has
+                value: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256"
         remediation: |
-          On the etcd server node, get the etcd data directory, passed as an argument --data-dir ,
-          from the below command:
-          ps -ef | grep $etcdbin
-          Run the below command (based on the etcd data directory found above). For example,
-          chown etcd:etcd /var/lib/etcd
-        scored: true
+          Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+          on the master node and set the below parameter.
+          --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM
+          _SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM
+          _SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM
+          _SHA384
+        scored: false
 
-      - id: 1.4.13
-        text: "Ensure that the admin.conf file permissions are set to 644 or
-        more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/admin.conf; then stat -c permissions=%a /etc/kubernetes/admin.conf; fi'"
+  - id: 1.3
+    text: "Controller Manager"
+    checks:
+      - id: 1.3.1
+        text: "Ensure that the --terminated-pod-gc-threshold argument is set as appropriate (Manual)"
+        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
         tests:
           test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
+            - flag: "--terminated-pod-gc-threshold"
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chmod 644 /etc/kubernetes/admin.conf
-        scored: true
+          Edit the Controller Manager pod specification file $controllermanagerconf
+          on the master node and set the --terminated-pod-gc-threshold to an appropriate threshold,
+          for example:
+          --terminated-pod-gc-threshold=10
+        scored: false
 
-      - id: 1.4.14
-        text: "Ensure that the admin.conf file ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/admin.conf; then stat -c %U:%G /etc/kubernetes/admin.conf; fi'"
+      - id: 1.3.2
+        text: "Ensure that the --profiling argument is set to false (Automated)"
+        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
         tests:
           test_items:
-            - flag: "root:root"
+            - flag: "--profiling"
               compare:
                 op: eq
-                value: "root:root"
-              set: true
+                value: false
         remediation: |
-          Run the below command (based on the file location on your system) on the master node.
-          For example,
-          chown root:root /etc/kubernetes/admin.conf
+          Edit the Controller Manager pod specification file $controllermanagerconf
+          on the master node and set the below parameter.
+          --profiling=false
         scored: true
 
-      - id: 1.4.15
-        text: "Ensure that the scheduler.conf file permissions are set to 644 or
-        more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/scheduler.conf; then stat -c permissions=%a /etc/kubernetes/scheduler.conf; fi'"
+      - id: 1.3.3
+        text: "Ensure that the --use-service-account-credentials argument is set to true (Automated)"
+        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
         tests:
           test_items:
-            - flag: "permissions"
+            - flag: "--use-service-account-credentials"
               compare:
-                op: bitmask
-                value: "644"
-              set: true
+                op: noteq
+                value: false
         remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chmod 644 /etc/kubernetes/scheduler.conf
+          Edit the Controller Manager pod specification file $controllermanagerconf
+          on the master node to set the below parameter.
+          --use-service-account-credentials=true
         scored: true
 
-      - id: 1.4.16
-        text: "Ensure that the scheduler.conf file ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/scheduler.conf; then stat -c %U:%G /etc/kubernetes/scheduler.conf; fi'"
+      - id: 1.3.4
+        text: "Ensure that the --service-account-private-key-file argument is set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
         tests:
           test_items:
-            - flag: "root:root"
-              compare:
-                op: eq
-                value: "root:root"
-              set: true
+            - flag: "--service-account-private-key-file"
         remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chown root:root /etc/kubernetes/scheduler.conf
+          Edit the Controller Manager pod specification file $controllermanagerconf
+          on the master node and set the --service-account-private-key-file parameter
+          to the private key file for service accounts.
+          --service-account-private-key-file=<filename>
         scored: true
 
-      - id: 1.4.17
-        text: "Ensure that the controller-manager.conf file permissions are set
-        to 644 or more restrictive (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/controller-manager.conf; then stat -c permissions=%a /etc/kubernetes/controller-manager.conf; fi'"
+      - id: 1.3.5
+        text: "Ensure that the --root-ca-file argument is set as appropriate (Automated)"
+        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
         tests:
           test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
+            - flag: "--root-ca-file"
         remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chmod 644 /etc/kubernetes/controller-manager.conf
+          Edit the Controller Manager pod specification file $controllermanagerconf
+          on the master node and set the --root-ca-file parameter to the certificate bundle file`.
+          --root-ca-file=<path/to/file>
         scored: true
 
-      - id: 1.4.18
-        text: "Ensure that the controller-manager.conf file ownership is set to root:root (Scored)"
-        audit: "/bin/sh -c 'if test -e /etc/kubernetes/controller-manager.conf; then stat -c %U:%G /etc/kubernetes/controller-manager.conf; fi'"
+      - id: 1.3.6
+        text: "Ensure that the RotateKubeletServerCertificate argument is set to true (Automated)"
+        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
         tests:
           test_items:
-            - flag: "root:root"
+            - flag: "--feature-gates"
               compare:
                 op: eq
-                value: "root:root"
-              set: true
+                value: "RotateKubeletServerCertificate=true"
         remediation: |
-          Run the below command (based on the file location on your system) on the
-          master node. For example, chown root:root /etc/kubernetes/controller-manager.conf
+          Edit the Controller Manager pod specification file $controllermanagerconf
+          on the master node and set the --feature-gates parameter to include RotateKubeletServerCertificate=true.
+          --feature-gates=RotateKubeletServerCertificate=true
         scored: true
 
-      - id: 1.4.19
-        text: "Ensure that the Kubernetes PKI directory and file ownership is set to root:root (Scored)"
-        audit: "ls -laR /etc/kubernetes/pki/"
-        type: "manual"
+      - id: 1.3.7
+        text: "Ensure that the --bind-address argument is set to 127.0.0.1 (Automated)"
+        audit: "/bin/ps -ef | grep $controllermanagerbin | grep -v grep"
         tests:
+          bin_op: or
           test_items:
-            - flag: "root root"
+            - flag: "--bind-address"
               compare:
                 op: eq
-                value: "root root"
-              set: true
-        remediation: |
-          [Manual test]
-          Run the below command (based on the file location on your system) on the master node.
-          For example, chown -R root:root /etc/kubernetes/pki/
-        scored: true
-
-      - id: 1.4.20
-        text: "Ensure that the Kubernetes PKI certificate file permissions are set to 644 or more restrictive (Scored)"
-        audit: "stat -c %n\ %a /etc/kubernetes/pki/*.crt"
-        type: "manual"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          [Manual test]
-          Run the below command (based on the file location on your system) on the master node.
-          For example, chmod -R 644 /etc/kubernetes/pki/*.crt
-        scored: true
-
-      - id: 1.4.21
-        text: "Ensure that the Kubernetes PKI key file permissions are set to 600 or more restrictive (Scored)"
-        audit: "stat -c %n\ %a /etc/kubernetes/pki/*.key"
-        type: "manual"
-        tests:
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "600"
-              set: true
+                value: "127.0.0.1"
+            - flag: "--bind-address"
+              set: false
         remediation: |
-          [Manual test]
-          Run the below command (based on the file location on your system) on the master node.
-          For example, chmod -R 600 /etc/kubernetes/pki/*.key
+          Edit the Controller Manager pod specification file $controllermanagerconf
+          on the master node and ensure the correct value for the --bind-address parameter
         scored: true
 
-  - id: 1.5
-    text: "etcd"
+  - id: 1.4
+    text: "Scheduler"
     checks:
-      - id: 1.5.1
-        text: "Ensure that the --cert-file and --key-file arguments are set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--cert-file"
-              set: true
-            - flag: "--key-file"
-              set: true
-        remediation: |
-          Follow the etcd service documentation and configure TLS encryption.
-          Then, edit the etcd pod specification file $etcdconf on the
-          master node and set the below parameters.
-          --ca-file=</path/to/ca-file>
-          --key-file=</path/to/key-file>
-        scored: true
-
-      - id: 1.5.2
-        text: "Ensure that the --client-cert-auth argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--client-cert-auth"
-              compare:
-                op: eq
-                value: true
-              set: true
-        remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and set the below parameter.
-          --client-cert-auth="true"
-        scored: true
-
-      - id: 1.5.3
-        text: "Ensure that the --auto-tls argument is not set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
+      - id: 1.4.1
+        text: "Ensure that the --profiling argument is set to false (Automated)"
+        audit: "/bin/ps -ef | grep $schedulerbin | grep -v grep"
         tests:
-          bin_op: or
           test_items:
-            - flag: "--auto-tls"
-              set: false
-            - flag: "--auto-tls"
+            - flag: "--profiling"
               compare:
                 op: eq
                 value: false
         remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and either remove the --auto-tls parameter or set it to false.
-            --auto-tls=false
-        scored: true
-
-      - id: 1.5.4
-        text: "Ensure that the --peer-cert-file and --peer-key-file arguments are
-        set as appropriate (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          bin_op: and
-          test_items:
-            - flag: "--peer-cert-file"
-              set: true
-            - flag: "--peer-key-file"
-              set: true
-        remediation: |
-          Follow the etcd service documentation and configure peer TLS encryption as appropriate
-          for your etcd cluster. Then, edit the etcd pod specification file $etcdconf on the
-          master node and set the below parameters.
-          --peer-client-file=</path/to/peer-cert-file>
-          --peer-key-file=</path/to/peer-key-file>
-        scored: true
-
-      - id: 1.5.5
-        text: "Ensure that the --peer-client-cert-auth argument is set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        tests:
-          test_items:
-            - flag: "--peer-client-cert-auth"
-              compare:
-                op: eq
-                value: true
-              set: true
-        remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and set the below parameter.
-          --peer-client-cert-auth=true
+          Edit the Scheduler pod specification file $schedulerconf file
+          on the master node and set the below parameter.
+          --profiling=false
         scored: true
 
-      - id: 1.5.6
-        text: "Ensure that the --peer-auto-tls argument is not set to true (Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
+      - id: 1.4.2
+        text: "Ensure that the --bind-address argument is set to 127.0.0.1 (Automated)"
+        audit: "/bin/ps -ef | grep $schedulerbin | grep -v grep"
         tests:
           bin_op: or
           test_items:
-            - flag: "--peer-auto-tls"
-              set: false
-            - flag: "--peer-auto-tls"
+            - flag: "--bind-address"
               compare:
                 op: eq
-                value: false
-              set: true
+                value: "127.0.0.1"
+            - flag: "--bind-address"
+              set: false
         remediation: |
-          Edit the etcd pod specification file $etcdconf on the master
-          node and either remove the --peer-auto-tls parameter or set it to false.
-          --peer-auto-tls=false
+          Edit the Scheduler pod specification file $schedulerconf
+          on the master node and ensure the correct value for the --bind-address parameter
         scored: true
-
-      - id: 1.5.7
-        text: "Ensure that a unique Certificate Authority is used for etcd (Not Scored)"
-        audit: "/bin/ps -ef | grep $etcdbin | grep -v grep"
-        type: "manual"
-        tests:
-          test_items:
-            - flag: "--trusted-ca-file"
-              set: true
-        remediation: |
-          [Manual test]
-          Follow the etcd documentation and create a dedicated certificate authority setup for the
-          etcd service.
-          Then, edit the etcd pod specification file $etcdconf on the
-          master node and set the below parameter.
-          --trusted-ca-file=</path/to/ca-file>
-        scored: false
-
-  - id: 1.6
-    text: "General Security Primitives"
-    checks:
-      - id: 1.6.1
-        text: "Ensure that the cluster-admin role is only used where required (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Remove any unneeded clusterrolebindings :
-          kubectl delete clusterrolebinding [name]
-        scored: false
-
-      - id: 1.6.2
-        text: "Create administrative boundaries between resources using namespaces (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the documentation and create namespaces for objects in your deployment as you
-          need them.
-        scored: false
-
-      - id: 1.6.3
-        text: "Create network segmentation using Network Policies (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the documentation and create NetworkPolicy objects as you need them.
-        scored: false
-
-      - id: 1.6.4
-        text: "Ensure that the seccomp profile is set to docker/default in your pod
-        definitions (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Seccomp is an alpha feature currently. By default, all alpha features are disabled. So, you
-          would need to enable alpha features in the apiserver by passing "--feature-
-          gates=AllAlpha=true" argument.
-          Edit the $apiserverconf file on the master node and set the KUBE_API_ARGS
-          parameter to "--feature-gates=AllAlpha=true"
-          KUBE_API_ARGS="--feature-gates=AllAlpha=true"
-          Based on your system, restart the kube-apiserver service. For example:
-          systemctl restart kube-apiserver.service
-          Use annotations to enable the docker/default seccomp profile in your pod definitions. An
-          example is as below:
-          apiVersion: v1
-          kind: Pod
-          metadata:
-            name: trustworthy-pod
-            annotations:
-              seccomp.security.alpha.kubernetes.io/pod: docker/default
-          spec:
-            containers:
-              - name: trustworthy-container
-                image: sotrustworthy:latest
-        scored: false
-
-      - id: 1.6.5
-        text: "Apply Security Context to Your Pods and Containers (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and apply security contexts to your pods. For a
-          suggested list of security contexts, you may refer to the CIS Security Benchmark for Docker
-          Containers.
-        scored: false
-
-      - id: 1.6.6
-        text: "Configure Image Provenance using ImagePolicyWebhook admission controller (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and setup image provenance.
-        scored: false
-
-      - id: 1.6.7
-        text: "Configure Network policies as appropriate (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow the Kubernetes documentation and setup network policies as appropriate.
-          For example, you could create a "default" isolation policy for a Namespace by creating a
-          NetworkPolicy that selects all pods but does not allow any traffic:
-          apiVersion: networking.k8s.io/v1
-          kind: NetworkPolicy
-          metadata:
-            name: default-deny
-          spec:
-            podSelector:
-        scored: false
-
-      - id: 1.6.8
-        text: "Place compensating controls in the form of PSP and RBAC for
-        privileged containers usage (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Follow Kubernetes documentation and setup PSP and RBAC authorization for your cluster.
-        scored: false
-
-  - id: 1.7
-    text: "PodSecurityPolicies"
-    checks:
-      - id: 1.7.1
-        text: "Do not admit privileged containers (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.privileged field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.2
-        text: "Do not admit containers wishing to share the host process ID namespace (Scored)"
-        type: "manual"
-        remediation: |
-         [Manual test]
-         Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.hostPID field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.3
-        text: "Do not admit containers wishing to share the host IPC namespace (Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.hostIPC field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.4
-        text: "Do not admit containers wishing to share the host network namespace (Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.hostNetwork field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.5
-        text: " Do not admit containers with allowPrivilegeEscalation (Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.allowPrivilegeEscalation field is omitted or set to false.
-        scored: false
-
-      - id: 1.7.6
-        text: "Do not admit root containers (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.runAsUser.rule is set to either MustRunAsNonRoot or MustRunAs with the range of UIDs not including 0.
-        scored: false
-
-      - id: 1.7.7
-        text: "Do not admit containers with dangerous capabilities (Not Scored)"
-        type: "manual"
-        remediation: |
-          [Manual test]
-          Create a PSP as described in the Kubernetes documentation, ensuring that the .spec.requiredDropCapabilities is set to include either NET_RAW or ALL.
-        scored: false
diff --git a/cfg/cis-1.4/node.yaml b/cfg/cis-1.6/node.yaml
similarity index 70%
rename from cfg/cis-1.4/node.yaml
rename to cfg/cis-1.6/node.yaml
index cad30b7..3602dd0 100644
--- a/cfg/cis-1.4/node.yaml
+++ b/cfg/cis-1.6/node.yaml
@@ -1,28 +1,169 @@
 ---
 controls:
-version: "1.13"
-id: "2"
-text: Worker Node Security Configuration
+version: 1.6
+id: 4
+text: "Worker Node Security Configuration"
 type: "node"
 groups:
-  - id: "2.1"
-    text: Kubelet
+  - id: 4.1
+    text: "Worker Node Configuration Files"
     checks:
-      - id: 2.1.1
-        text: Ensure that the --anonymous-auth argument is set to false (Scored)
+      - id: 4.1.1
+        text: "Ensure that the kubelet service file permissions are set to 644 or more restrictive (Automated)"
+        audit: '/bin/sh -c ''if test -e $kubeletsvc; then stat -c permissions=%a $kubeletsvc; fi'' '
+        tests:
+          test_items:
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
+        remediation: |
+          Run the below command (based on the file location on your system) on the each worker node.
+          For example,
+          chmod 644 $kubeletsvc
+        scored: true
+
+      - id: 4.1.2
+        text: "Ensure that the kubelet service file ownership is set to root:root (Automated)"
+        audit: '/bin/sh -c ''if test -e $kubeletsvc; then stat -c %U:%G $kubeletsvc; fi'' '
+        tests:
+          test_items:
+            - flag: root:root
+        remediation: |
+          Run the below command (based on the file location on your system) on the each worker node.
+          For example,
+          chown root:root $kubeletsvc
+        scored: true
+
+      - id: 4.1.3
+        text: "If proxy kubeconfig file exists ensure permissions are set to 644 or more restrictive (Manual)"
+        audit: '/bin/sh -c ''if test -e $proxykubeconfig; then stat -c permissions=%a $proxykubeconfig; fi'' '
+        tests:
+          test_items:
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
+        remediation: |
+          Run the below command (based on the file location on your system) on the each worker node.
+          For example,
+          chmod 644 $proxykubeconfig
+        scored: false
+
+      - id: 4.1.4
+        text: "Ensure that the proxy kubeconfig file ownership is set to root:root (Manual)"
+        audit: '/bin/sh -c ''if test -e $proxykubeconfig; then stat -c %U:%G $proxykubeconfig; fi'' '
+        tests:
+          test_items:
+            - flag: root:root
+        remediation: |
+          Run the below command (based on the file location on your system) on the each worker node.
+          For example, chown root:root $proxykubeconfig
+        scored: false
+
+      - id: 4.1.5
+        text: "Ensure that the --kubeconfig kubelet.conf file permissions are set to 644 or more restrictive (Automated)"
+        audit: '/bin/sh -c ''if test -e $kubeletkubeconfig; then stat -c permissions=%a $kubeletkubeconfig; fi'' '
+        tests:
+          test_items:
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
+        remediation: |
+          Run the below command (based on the file location on your system) on the each worker node.
+          For example,
+          chmod 644 $kubeletkubeconfig
+        scored: true
+
+      - id: 4.1.6
+        text: "Ensure that the --kubeconfig kubelet.conf file ownership is set to root:root (Manual)"
+        audit: '/bin/sh -c ''if test -e $kubeletkubeconfig; then stat -c %U:%G $kubeletkubeconfig; fi'' '
+        tests:
+          test_items:
+            - flag: root:root
+        remediation: |
+          Run the below command (based on the file location on your system) on the each worker node.
+          For example,
+          chown root:root $kubeletkubeconfig
+        scored: false
+
+      - id: 4.1.7
+        text: "Ensure that the certificate authorities file permissions are set to 644 or more restrictive (Manual)"
+        audit: |
+          CAFILE=$(ps -ef | grep kubelet | grep -v apiserver | grep -- --client-ca-file= | awk -F '--client-ca-file=' '{print $2}' | awk '{print $1}')
+          if test -z $CAFILE; then CAFILE=$kubeletcafile; fi
+          if test -e $CAFILE; then stat -c permissions=%a $CAFILE; fi
+        tests:
+          test_items:
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
+        remediation: |
+          Run the following command to modify the file permissions of the
+          --client-ca-file chmod 644 <filename>
+        scored: false
+
+      - id: 4.1.8
+        text: "Ensure that the client certificate authorities file ownership is set to root:root (Manual)"
+        audit: |
+          CAFILE=$(ps -ef | grep kubelet | grep -v apiserver | grep -- --client-ca-file= | awk -F '--client-ca-file=' '{print $2}' | awk '{print $1}')
+          if test -z $CAFILE; then CAFILE=$kubeletcafile; fi
+          if test -e $CAFILE; then stat -c %U:%G $CAFILE; fi
+        tests:
+          test_items:
+            - flag: root:root
+              compare:
+                op: eq
+                value: root:root
+        remediation: |
+          Run the following command to modify the ownership of the --client-ca-file.
+          chown root:root <filename>
+        scored: false
+
+      - id: 4.1.9
+        text: "Ensure that the kubelet --config configuration file has permissions set to 644 or more restrictive (Automated)"
+        audit: '/bin/sh -c ''if test -e $kubeletconf; then stat -c permissions=%a $kubeletconf; fi'' '
+        tests:
+          test_items:
+            - flag: "permissions"
+              compare:
+                op: bitmask
+                value: "644"
+        remediation: |
+          Run the following command (using the config file location identified in the Audit step)
+          chmod 644 $kubeletconf
+        scored: true
+
+      - id: 4.1.10
+        text: "Ensure that the kubelet --config configuration file ownership is set to root:root (Automated)"
+        audit: '/bin/sh -c ''if test -e $kubeletconf; then stat -c %U:%G $kubeletconf; fi'' '
+        tests:
+          test_items:
+            - flag: root:root
+        remediation: |
+          Run the following command (using the config file location identified in the Audit step)
+          chown root:root $kubeletconf
+        scored: true
+
+  - id: 4.2
+    text: "Kubelet"
+    checks:
+      - id: 4.2.1
+        text: "Ensure that the anonymous-auth argument is set to false (Automated)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: "--anonymous-auth"
               path: '{.authentication.anonymous.enabled}'
-              set: true
               compare:
                 op: eq
                 value: false
         remediation: |
           If using a Kubelet config file, edit the file to set authentication: anonymous: enabled to
-          false .
+          false.
           If using executable arguments, edit the kubelet service file
           $kubeletsvc on each worker node and
           set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
@@ -32,21 +173,20 @@ groups:
           systemctl restart kubelet.service
         scored: true
 
-      - id: 2.1.2
-        text: Ensure that the --authorization-mode argument is not set to AlwaysAllow (Scored)
+      - id: 4.2.2
+        text: "Ensure that the --authorization-mode argument is not set to AlwaysAllow (Automated)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --authorization-mode
               path: '{.authorization.mode}'
-              set: true
               compare:
                 op: nothave
                 value: AlwaysAllow
         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
+          If using a Kubelet config file, edit the file to set authorization: mode to Webhook. If
+          using executable arguments, edit the kubelet service file
           $kubeletsvc on each worker node and
           set the below parameter in KUBELET_AUTHZ_ARGS variable.
           --authorization-mode=Webhook
@@ -55,15 +195,14 @@ groups:
           systemctl restart kubelet.service
         scored: true
 
-      - id: 2.1.3
-        text: Ensure that the --client-ca-file argument is set as appropriate (Scored)
+      - id: 4.2.3
+        text: "Ensure that the --client-ca-file argument is set as appropriate (Automated)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --client-ca-file
               path: '{.authentication.x509.clientCAFile}'
-              set: true
         remediation: |
           If using a Kubelet config file, edit the file to set authentication: x509: clientCAFile to
           the location of the client CA file.
@@ -76,20 +215,23 @@ groups:
           systemctl restart kubelet.service
         scored: true
 
-      - id: 2.1.4
-        text: Ensure that the --read-only-port argument is set to 0 (Scored)
+      - id: 4.2.4
+        text: "Ensure that the --read-only-port argument is set to 0 (Manual)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
+          bin_op: or
           test_items:
             - flag: "--read-only-port"
               path: '{.readOnlyPort}'
-              set: true
               compare:
                 op: eq
                 value: 0
+            - flag: "--read-only-port"
+              path: '{.readOnlyPort}'
+              set: false
         remediation: |
-          If using a Kubelet config file, edit the file to set readOnlyPort to 0 .
+          If using a Kubelet config file, edit the file to set readOnlyPort to 0.
           If using command line arguments, edit the kubelet service file
           $kubeletsvc on each worker node and
           set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
@@ -97,17 +239,16 @@ groups:
           Based on your system, restart the kubelet service. For example:
           systemctl daemon-reload
           systemctl restart kubelet.service
-        scored: true
+        scored: false
 
-      - id: 2.1.5
-        text: Ensure that the --streaming-connection-idle-timeout argument is not set to 0 (Scored)
+      - id: 4.2.5
+        text: "Ensure that the --streaming-connection-idle-timeout argument is not set to 0 (Manual)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --streaming-connection-idle-timeout
               path: '{.streamingConnectionIdleTimeout}'
-              set: true
               compare:
                 op: noteq
                 value: 0
@@ -125,22 +266,21 @@ groups:
           Based on your system, restart the kubelet service. For example:
           systemctl daemon-reload
           systemctl restart kubelet.service
-        scored: true
+        scored: false
 
-      - id: 2.1.6
-        text: Ensure that the --protect-kernel-defaults argument is set to true (Scored)
+      - id: 4.2.6
+        text: "Ensure that the --protect-kernel-defaults argument is set to true (Automated)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --protect-kernel-defaults
               path: '{.protectKernelDefaults}'
-              set: true
               compare:
                 op: eq
                 value: true
         remediation: |
-          If using a Kubelet config file, edit the file to set protectKernelDefaults: true .
+          If using a Kubelet config file, edit the file to set protectKernelDefaults: true.
           If using command line arguments, edit the kubelet service file
           $kubeletsvc on each worker node and
           set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
@@ -150,15 +290,14 @@ groups:
           systemctl restart kubelet.service
         scored: true
 
-      - id: 2.1.7
-        text: Ensure that the --make-iptables-util-chains argument is set to true (Scored)
+      - id: 4.2.7
+        text: "Ensure that the --make-iptables-util-chains argument is set to true (Automated)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --make-iptables-util-chains
               path: '{.makeIPTablesUtilChains}'
-              set: true
               compare:
                 op: eq
                 value: true
@@ -167,7 +306,7 @@ groups:
               set: false
           bin_op: or
         remediation: |
-          If using a Kubelet config file, edit the file to set makeIPTablesUtilChains: true .
+          If using a Kubelet config file, edit the file to set makeIPTablesUtilChains: true.
           If using command line arguments, edit the kubelet service file
           $kubeletsvc on each worker node and
           remove the --make-iptables-util-chains argument from the
@@ -177,8 +316,8 @@ groups:
           systemctl restart kubelet.service
         scored: true
 
-      - id: 2.1.8
-        text: Ensure that the --hostname-override argument is not set (Scored)
+      - id: 4.2.8
+        text: "Ensure that the --hostname-override argument is not set (Manual)"
         # This is one of those properties that can only be set as a command line argument.
         # To check if the property is set as expected, we need to parse the kubelet command
         # instead reading the Kubelet Configuration file.
@@ -194,93 +333,61 @@ groups:
           Based on your system, restart the kubelet service. For example:
           systemctl daemon-reload
           systemctl restart kubelet.service
-        scored: true
+        scored: false
 
-      - id: 2.1.9
-        text: Ensure that the --event-qps argument is set to 0 (Scored)
+      - id: 4.2.9
+        text: "Ensure that the --event-qps argument is set to 0 or a level which ensures appropriate event capture (Manual)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --event-qps
               path: '{.eventRecordQPS}'
-              set: true
               compare:
                 op: eq
                 value: 0
         remediation: |
-          If using a Kubelet config file, edit the file to set eventRecordQPS: 0 .
+          If using a Kubelet config file, edit the file to set eventRecordQPS: to an appropriate level.
           If using command line arguments, 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:
           systemctl daemon-reload
           systemctl restart kubelet.service
-        scored: true
+        scored: false
 
-      - id: 2.1.10
-        text: Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Scored)
+      - id: 4.2.10
+        text: "Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Manual)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --tls-cert-file
               path: '{.tlsCertFile}'
-              set: true
             - flag: --tls-private-key-file
               path: '{.tlsPrivateKeyFile}'
-              set: true
-          bin_op: and
         remediation: |
-          If using a Kubelet config file, edit the file to set tlsCertFile to the location of the certificate
-          file to use to identify this Kubelet, and tlsPrivateKeyFile to the location of the
-          corresponding private key file.
+          If using a Kubelet config file, edit the file to set tlsCertFile to the location
+          of the certificate 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
           $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>
-          Based on your system, restart the kubelet service. For example:
-          systemctl daemon-reload
-          systemctl restart kubelet.service
-        scored: true
-
-      - id: 2.1.11
-        text: '[DEPRECATED] Ensure that the --cadvisor-port argument is set to 0'
-        # This is one of those properties that can only be set as a command line argument.
-        # To check if the property is set as expected, we need to parse the kubelet command
-        # instead reading the Kubelet Configuration file.
-        audit: "/bin/ps -fC $kubeletbin "
-        type: skip
-        tests:
-          test_items:
-            - flag: --cadvisor-port
-              set: true
-              compare:
-                op: eq
-                value: 0
-            - flag: --cadvisor-port
-              set: false
-          bin_op: or
-        remediation: |
-          Edit the kubelet service file $kubeletsvc
-          on each worker node and set the below parameter in KUBELET_CADVISOR_ARGS variable.
-          --cadvisor-port=0
+          --tls-private-key-file=<path/to/tls-key-file>
           Based on your system, restart the kubelet service. For example:
           systemctl daemon-reload
           systemctl restart kubelet.service
         scored: false
 
-      - id: 2.1.12
-        text: Ensure that the --rotate-certificates argument is not set to false (Scored)
+      - id: 4.2.11
+        text: "Ensure that the --rotate-certificates argument is not set to false (Manual)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --rotate-certificates
               path: '{.rotateCertificates}'
-              set: true
               compare:
                 op: eq
                 value: true
@@ -289,23 +396,25 @@ groups:
               set: false
           bin_op: or
         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 $kubeletsvc
-          on each worker node and add --rotate-certificates=true argument to the KUBELET_CERTIFICATE_ARGS variable.
+          If using a Kubelet config file, edit the file to add the line rotateCertificates: true or
+          remove it altogether to use the default value.
+          If using command line arguments, edit the kubelet service file
+          $kubeletsvc on each worker node and
+          remove --rotate-certificates=false argument from the KUBELET_CERTIFICATE_ARGS
+          variable.
           Based on your system, restart the kubelet service. For example:
           systemctl daemon-reload
           systemctl restart kubelet.service
-        scored: true
+        scored: false
 
-      - id: 2.1.13
-        text: Ensure that the RotateKubeletServerCertificate argument is set to true (Scored)
+      - id: 4.2.12
+        text: "Verify that the RotateKubeletServerCertificate argument is set to true (Manual)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: RotateKubeletServerCertificate
               path: '{.featureGates.RotateKubeletServerCertificate}'
-              set: true
               compare:
                 op: eq
                 value: true
@@ -316,176 +425,28 @@ groups:
           Based on your system, restart the kubelet service. For example:
           systemctl daemon-reload
           systemctl restart kubelet.service
-        scored: true
+        scored: false
 
-      - id: 2.1.14
-        text: Ensure that the Kubelet only makes use of Strong Cryptographic Ciphers (Not Scored)
+      - id: 4.2.13
+        text: "Ensure that the Kubelet only makes use of Strong Cryptographic Ciphers (Manual)"
         audit: "/bin/ps -fC $kubeletbin"
         audit_config: "/bin/cat $kubeletconf"
         tests:
           test_items:
             - flag: --tls-cipher-suites
               path: '{range .tlsCipherSuites[:]}{}{'',''}{end}'
-              set: true
               compare:
                 op: valid_elements
                 value: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
         remediation: |
-          If using a Kubelet config file, edit the file to set TLSCipherSuites: to TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
-          If using executable arguments, edit the kubelet service file $kubeletsvc on each worker node and set the below parameter.
+          If using a Kubelet config file, edit the file to set TLSCipherSuites: to
+          TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
+          or to a subset of these values.
+          If using executable arguments, edit the kubelet service file
+          $kubeletsvc on each worker node and
+          set the --tls-cipher-suites parameter as follows, or to a subset of these values.
           --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256
+          Based on your system, restart the kubelet service. For example:
+          systemctl daemon-reload
+          systemctl restart kubelet.service
         scored: false
-
-  - id: "2.2"
-    text: Configuration Files
-    checks:
-      - id: 2.2.1
-        text: Ensure that the kubelet.conf file permissions are set to 644 or more restrictive (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletkubeconfig; then stat -c permissions=%a $kubeletkubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              set: true
-              compare:
-                op: bitmask
-                value: "644"
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chmod 644 $kubeletkubeconfig
-        scored: true
-
-      - id: 2.2.2
-        text: Ensure that the kubelet.conf file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletkubeconfig; then stat -c %U:%G $kubeletkubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-              compare:
-                op: eq
-                value: root:root
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chown root:root $kubeletkubeconfig
-        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 $kubeletsvc; then stat -c permissions=%a $kubeletsvc; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              set: true
-              compare:
-                op: bitmask
-                value: "644"
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chmod 644 $kubeletsvc
-        scored: true
-
-      - id: 2.2.4
-        text: Ensure that the kubelet service file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletsvc; then stat -c %U:%G $kubeletsvc; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chown root:root $kubeletsvc
-        scored: true
-
-      - id: 2.2.5
-        text: Ensure that the proxy kubeconfig file permissions are set to 644 or more restrictive (Scored)
-        audit: '/bin/sh -c ''if test -e $proxykubeconfig; then stat -c permissions=%a $proxykubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              set: true
-              compare:
-                op: bitmask
-                value: "644"
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chmod 644 $proxykubeconfig
-        scored: true
-
-      - id: 2.2.6
-        text: Ensure that the proxy kubeconfig file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $proxykubeconfig; then stat -c %U:%G $proxykubeconfig; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-        remediation: |
-          Run the below command (based on the file location on your system) on the each worker
-          node. For example,
-          chown root:root $proxykubeconfig
-        scored: true
-
-      - id: 2.2.7
-        text: Ensure that the certificate authorities file permissions are set to 644 or more restrictive (Scored)
-        audit: "/bin/sh -c 'if test -e $kubeletcafile; then stat -c permissions=%a $kubeletcafile; fi'"
-        tests:
-          bin_op: or
-          test_items:
-            - flag: "permissions"
-              compare:
-                op: bitmask
-                value: "644"
-              set: true
-        remediation: |
-          Run the following command to modify the file permissions of the --client-ca-file
-          chmod 644 <filename>
-        scored: true
-
-      - id: 2.2.8
-        text: Ensure that the client certificate authorities file ownership is set to root:root (Scored)
-        audit: |
-          CAFILE=$(ps -ef | grep kubelet | grep -v apiserver | grep -- --client-ca-file= | awk -F '--client-ca-file=' '{print $2}' | awk '{print $1}')
-          if test -z $CAFILE; then CAFILE=$kubeletcafile; fi
-          if test -e $CAFILE; then stat -c %U:%G $CAFILE; fi
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-              compare:
-                op: eq
-                value: root:root
-        remediation: |
-          Run the following command to modify the ownership of the --client-ca-file .
-          chown root:root <filename>
-        scored: true
-
-      - id: 2.2.9
-        text: Ensure that the kubelet configuration file ownership is set to root:root (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletconf; then stat -c %U:%G $kubeletconf; fi'' '
-        tests:
-          test_items:
-            - flag: root:root
-              set: true
-        remediation: |
-          Run the following command (using the config file location identified in the Audit step)
-          chown root:root $kubeletconf
-        scored: true
-
-      - id: 2.2.10
-        text: Ensure that the kubelet configuration file has permissions set to 644 or more restrictive (Scored)
-        audit: '/bin/sh -c ''if test -e $kubeletconf; then stat -c permissions=%a $kubeletconf; fi'' '
-        tests:
-          test_items:
-            - flag: "permissions"
-              set: true
-              compare:
-                op: bitmask
-                value: "644"
-        remediation: |
-          Run the following command (using the config file location identified in the Audit step)
-          chmod 644 $kubeletconf
-        scored: true
diff --git a/cfg/cis-1.6/policies.yaml b/cfg/cis-1.6/policies.yaml
new file mode 100644
index 0000000..14b5ffa
--- /dev/null
+++ b/cfg/cis-1.6/policies.yaml
@@ -0,0 +1,239 @@
+---
+controls:
+version: 1.6
+id: 5
+text: "Kubernetes Policies"
+type: "policies"
+groups:
+  - id: 5.1
+    text: "RBAC and Service Accounts"
+    checks:
+      - id: 5.1.1
+        text: "Ensure that the cluster-admin role is only used where required (Manual)"
+        type: "manual"
+        remediation: |
+          Identify all clusterrolebindings to the cluster-admin role. Check if they are used and
+          if they need this role or if they could use a role with fewer privileges.
+          Where possible, first bind users to a lower privileged role and then remove the
+          clusterrolebinding to the cluster-admin role :
+          kubectl delete clusterrolebinding [name]
+        scored: false
+
+      - id: 5.1.2
+        text: "Minimize access to secrets (Manual)"
+        type: "manual"
+        remediation: |
+          Where possible, remove get, list and watch access to secret objects in the cluster.
+        scored: false
+
+      - id: 5.1.3
+        text: "Minimize wildcard use in Roles and ClusterRoles (Manual)"
+        type: "manual"
+        remediation: |
+          Where possible replace any use of wildcards in clusterroles and roles with specific
+          objects or actions.
+        scored: false
+
+      - id: 5.1.4
+        text: "Minimize access to create pods (Manual)"
+        type: "manual"
+        remediation: |
+          Where possible, remove create access to pod objects in the cluster.
+        scored: false
+
+      - id: 5.1.5
+        text: "Ensure that default service accounts are not actively used. (Manual)"
+        type: "manual"
+        remediation: |
+          Create explicit service accounts wherever a Kubernetes workload requires specific access
+          to the Kubernetes API server.
+          Modify the configuration of each default service account to include this value
+          automountServiceAccountToken: false
+        scored: false
+
+      - id: 5.1.6
+        text: "Ensure that Service Account Tokens are only mounted where necessary (Manual)"
+        type: "manual"
+        remediation: |
+          Modify the definition of pods and service accounts which do not need to mount service
+          account tokens to disable it.
+        scored: false
+
+  - id: 5.2
+    text: "Pod Security Policies"
+    checks:
+      - id: 5.2.1
+        text: "Minimize the admission of privileged containers (Manual)"
+        type: "manual"
+        remediation: |
+          Create a PSP as described in the Kubernetes documentation, ensuring that
+          the .spec.privileged field is omitted or set to false.
+        scored: false
+
+      - id: 5.2.2
+        text: "Minimize the admission of containers wishing to share the host process ID namespace (Manual)"
+        type: "manual"
+        remediation: |
+          Create a PSP as described in the Kubernetes documentation, ensuring that the
+          .spec.hostPID field is omitted or set to false.
+        scored: false
+
+      - id: 5.2.3
+        text: "Minimize the admission of containers wishing to share the host IPC namespace (Manual)"
+        type: "manual"
+        remediation: |
+          Create a PSP as described in the Kubernetes documentation, ensuring that the
+          .spec.hostIPC field is omitted or set to false.
+        scored: false
+
+      - id: 5.2.4
+        text: "Minimize the admission of containers wishing to share the host network namespace (Manual)"
+        type: "manual"
+        remediation: |
+          Create a PSP as described in the Kubernetes documentation, ensuring that the
+          .spec.hostNetwork field is omitted or set to false.
+        scored: false
+
+      - id: 5.2.5
+        text: "Minimize the admission of containers with allowPrivilegeEscalation (Manual)"
+        type: "manual"
+        remediation: |
+          Create a PSP as described in the Kubernetes documentation, ensuring that the
+          .spec.allowPrivilegeEscalation field is omitted or set to false.
+        scored: false
+
+      - id: 5.2.6
+        text: "Minimize the admission of root containers (Manual)"
+        type: "manual"
+        remediation: |
+          Create a PSP as described in the Kubernetes documentation, ensuring that the
+          .spec.runAsUser.rule is set to either MustRunAsNonRoot or MustRunAs with the range of
+          UIDs not including 0.
+        scored: false
+
+      - id: 5.2.7
+        text: "Minimize the admission of containers with the NET_RAW capability (Manual)"
+        type: "manual"
+        remediation: |
+          Create a PSP as described in the Kubernetes documentation, ensuring that the
+          .spec.requiredDropCapabilities is set to include either NET_RAW or ALL.
+        scored: false
+
+      - id: 5.2.8
+        text: "Minimize the admission of containers with added capabilities (Manual)"
+        type: "manual"
+        remediation: |
+          Ensure that allowedCapabilities is not present in PSPs for the cluster unless
+          it is set to an empty array.
+        scored: false
+
+      - id: 5.2.9
+        text: "Minimize the admission of containers with capabilities assigned (Manual)"
+        type: "manual"
+        remediation: |
+          Review the use of capabilites in applications runnning on your cluster. Where a namespace
+          contains applicaions which do not require any Linux capabities to operate consider adding
+          a PSP which forbids the admission of containers which do not drop all capabilities.
+        scored: false
+
+  - id: 5.3
+    text: "Network Policies and CNI"
+    checks:
+      - id: 5.3.1
+        text: "Ensure that the CNI in use supports Network Policies (Manual)"
+        type: "manual"
+        remediation: |
+          If the CNI plugin in use does not support network policies, consideration should be given to
+          making use of a different plugin, or finding an alternate mechanism for restricting traffic
+          in the Kubernetes cluster.
+        scored: false
+
+      - id: 5.3.2
+        text: "Ensure that all Namespaces have Network Policies defined (Manual)"
+        type: "manual"
+        remediation: |
+          Follow the documentation and create NetworkPolicy objects as you need them.
+        scored: false
+
+  - id: 5.4
+    text: "Secrets Management"
+    checks:
+      - id: 5.4.1
+        text: "Prefer using secrets as files over secrets as environment variables (Manual)"
+        type: "manual"
+        remediation: |
+          if possible, rewrite application code to read secrets from mounted secret files, rather than
+          from environment variables.
+        scored: false
+
+      - id: 5.4.2
+        text: "Consider external secret storage (Manual)"
+        type: "manual"
+        remediation: |
+          Refer to the secrets management options offered by your cloud provider or a third-party
+          secrets management solution.
+        scored: false
+
+  - id: 5.5
+    text: "Extensible Admission Control"
+    checks:
+      - id: 5.5.1
+        text: "Configure Image Provenance using ImagePolicyWebhook admission controller (Manual)"
+        type: "manual"
+        remediation: |
+          Follow the Kubernetes documentation and setup image provenance.
+        scored: false
+
+  - id: 5.7
+    text: "General Policies"
+    checks:
+      - id: 5.7.1
+        text: "Create administrative boundaries between resources using namespaces (Manual)"
+        type: "manual"
+        remediation: |
+          Follow the documentation and create namespaces for objects in your deployment as you need
+          them.
+        scored: false
+
+      - id: 5.7.2
+        text: "Ensure that the seccomp profile is set to docker/default in your pod definitions (Manual)"
+        type: "manual"
+        remediation: |
+          Seccomp is an alpha feature currently. By default, all alpha features are disabled. So, you
+          would need to enable alpha features in the apiserver by passing "--feature-
+          gates=AllAlpha=true" argument.
+          Edit the /etc/kubernetes/apiserver file on the master node and set the KUBE_API_ARGS
+          parameter to "--feature-gates=AllAlpha=true"
+          KUBE_API_ARGS="--feature-gates=AllAlpha=true"
+          Based on your system, restart the kube-apiserver service. For example:
+          systemctl restart kube-apiserver.service
+          Use annotations to enable the docker/default seccomp profile in your pod definitions. An
+          example is as below:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: trustworthy-pod
+            annotations:
+              seccomp.security.alpha.kubernetes.io/pod: docker/default
+          spec:
+            containers:
+              - name: trustworthy-container
+                image: sotrustworthy:latest
+        scored: false
+
+      - id: 5.7.3
+        text: "Apply Security Context to Your Pods and Containers (Manual)"
+        type: "manual"
+        remediation: |
+          Follow the Kubernetes documentation and apply security contexts to your pods. For a
+          suggested list of security contexts, you may refer to the CIS Security Benchmark for Docker
+          Containers.
+        scored: false
+
+      - id: 5.7.4
+        text: "The default namespace should not be used (Manual)"
+        type: "manual"
+        remediation: |
+          Ensure that namespaces are created to allow for appropriate segregation of Kubernetes
+          resources and that all new resources are created in a specific namespace.
+        scored: false
diff --git a/cfg/config.yaml b/cfg/config.yaml
index f772e5e..7170877 100644
--- a/cfg/config.yaml
+++ b/cfg/config.yaml
@@ -189,27 +189,24 @@ managedservices:
   components: []
 
 version_mapping:
-  "1.11": "cis-1.3"
-  "1.12": "cis-1.3"
-  "1.13": "cis-1.4"
-  "1.14": "cis-1.4"
   "1.15": "cis-1.5"
-  "1.16": "cis-1.5"
-  "1.17": "cis-1.5"
-  "1.18": "cis-1.5"
+  "1.16": "cis-1.6"
+  "1.17": "cis-1.6"
+  "1.18": "cis-1.6"
+  "1.19": "cis-1.6"
   "eks-1.0": "eks-1.0"
   "gke-1.0": "gke-1.0"
   "ocp-3.10": "rh-0.7"
   "ocp-3.11": "rh-0.7"
 
 target_mapping:
-  "cis-1.3":
-    - "master"
-    - "node"
-  "cis-1.4":
+  "cis-1.5":
     - "master"
     - "node"
-  "cis-1.5":
+    - "controlplane"
+    - "etcd"
+    - "policies"
+  "cis-1.6":
     - "master"
     - "node"
     - "controlplane"
diff --git a/cmd/common.go b/cmd/common.go
index d9674fc..49a4e2d 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -91,7 +91,7 @@ func runChecks(nodetype check.NodeType, testYamlFile string) {
 
 	// Checks that the executables we need for the section are running.
 	if err != nil {
-		exitWithError(fmt.Errorf("failed to get a set of executables needed for tests: %v", err))
+		glog.V(1).Info(fmt.Sprintf("failed to get a set of executables needed for tests: %v", err))
 	}
 
 	confmap := getFiles(typeConf, "config")
diff --git a/hack/node_only.yaml b/hack/node_only.yaml
index 31b6ba8..93e2c83 100644
--- a/hack/node_only.yaml
+++ b/hack/node_only.yaml
@@ -64,12 +64,10 @@ node:
     defaultkubeconfig: "/etc/kubernetes/proxy.conf"
 
 version_mapping:
-  "1.11": "cis-1.3"
-  "1.12": "cis-1.3"
-  "1.13": "cis-1.4"
-  "1.14": "cis-1.4"
   "1.15": "cis-1.5"
-  "1.16": "cis-1.5"
-  "1.17": "cis-1.5"
+  "1.16": "cis-1.6"
+  "1.17": "cis-1.6"
+  "1.18": "cis-1.6"
+  "1.19": "cis-1.6"
   "ocp-3.10": "rh-0.7"
   "ocp-3.11": "rh-0.7"


Test patch:
diff --git a/check/test.go b/check/test.go
index 165c602..bb16f73 100644
--- a/check/test.go
+++ b/check/test.go
@@ -169,6 +169,7 @@ func (t testItem) execute(s string) *testOutput {
 		}
 	}
 
+	result.actualResult = s
 	return result
 }
 
diff --git a/cmd/common_test.go b/cmd/common_test.go
index 909c46e..15f4164 100644
--- a/cmd/common_test.go
+++ b/cmd/common_test.go
@@ -206,14 +206,15 @@ func TestMapToCISVersion(t *testing.T) {
 		expErr      string
 	}{
 		{kubeVersion: "1.9", succeed: false, exp: "", expErr: "unable to find a matching Benchmark Version match for kubernetes version: 1.9"},
-		{kubeVersion: "1.11", succeed: true, exp: "cis-1.3"},
-		{kubeVersion: "1.12", succeed: true, exp: "cis-1.3"},
-		{kubeVersion: "1.13", succeed: true, exp: "cis-1.4"},
-		{kubeVersion: "1.14", succeed: true, exp: "cis-1.4"},
+		{kubeVersion: "1.11", succeed: false, exp: "", expErr: "unable to find a matching Benchmark Version match for kubernetes version: 1.11"},
+		{kubeVersion: "1.12", succeed: false, exp: "", expErr: "unable to find a matching Benchmark Version match for kubernetes version: 1.12"},
+		{kubeVersion: "1.13", succeed: false, exp: "", expErr: "unable to find a matching Benchmark Version match for kubernetes version: 1.13"},
+		{kubeVersion: "1.14", succeed: false, exp: "", expErr: "unable to find a matching Benchmark Version match for kubernetes version: 1.14"},
 		{kubeVersion: "1.15", succeed: true, exp: "cis-1.5"},
-		{kubeVersion: "1.16", succeed: true, exp: "cis-1.5"},
-		{kubeVersion: "1.17", succeed: true, exp: "cis-1.5"},
-		{kubeVersion: "1.18", succeed: true, exp: "cis-1.5"},
+		{kubeVersion: "1.16", succeed: true, exp: "cis-1.6"},
+		{kubeVersion: "1.17", succeed: true, exp: "cis-1.6"},
+		{kubeVersion: "1.18", succeed: true, exp: "cis-1.6"},
+		{kubeVersion: "1.19", succeed: true, exp: "cis-1.6"},
 		{kubeVersion: "gke-1.0", succeed: true, exp: "gke-1.0"},
 		{kubeVersion: "ocp-3.10", succeed: true, exp: "rh-0.7"},
 		{kubeVersion: "ocp-3.11", succeed: true, exp: "rh-0.7"},
@@ -302,7 +303,7 @@ func TestGetBenchmarkVersion(t *testing.T) {
 
 	withFakeKubectl := func(kubeVersion, benchmarkVersion string, v *viper.Viper, fn getBenchmarkVersionFnToTest) (string, error) {
 		execCode := `#!/bin/sh
-		echo "Server Version: v1.13.10"
+		echo "Server Version: v1.15.10"
 		`
 		restore, err := fakeExecutableInPath("kubectl", execCode)
 		if err != nil {
@@ -335,8 +336,8 @@ func TestGetBenchmarkVersion(t *testing.T) {
 	}{
 		{n: "both versions", kubeVersion: "1.11", benchmarkVersion: "cis-1.3", exp: "cis-1.3", callFn: withNoPath, v: viper.New(), succeed: false},
 		{n: "no version-missing-kubectl", kubeVersion: "", benchmarkVersion: "", v: viperWithData, exp: "", callFn: withNoPath, succeed: false},
-		{n: "no version-fakeKubectl", kubeVersion: "", benchmarkVersion: "", v: viperWithData, exp: "cis-1.4", callFn: withFakeKubectl, succeed: true},
-		{n: "kubeVersion", kubeVersion: "1.11", benchmarkVersion: "", v: viperWithData, exp: "cis-1.3", callFn: withNoPath, succeed: true},
+		{n: "no version-fakeKubectl", kubeVersion: "", benchmarkVersion: "", v: viperWithData, exp: "cis-1.5", callFn: withFakeKubectl, succeed: true},
+		{n: "kubeVersion", kubeVersion: "1.15", benchmarkVersion: "", v: viperWithData, exp: "cis-1.5", callFn: withNoPath, succeed: true},
 		{n: "ocpVersion310", kubeVersion: "ocp-3.10", benchmarkVersion: "", v: viperWithData, exp: "rh-0.7", callFn: withNoPath, succeed: true},
 		{n: "ocpVersion311", kubeVersion: "ocp-3.11", benchmarkVersion: "", v: viperWithData, exp: "rh-0.7", callFn: withNoPath, succeed: true},
 		{n: "gke10", kubeVersion: "gke-1.0", benchmarkVersion: "", v: viperWithData, exp: "gke-1.0", callFn: withNoPath, succeed: true},
@@ -375,26 +376,26 @@ func TestValidTargets(t *testing.T) {
 		expected  bool
 	}{
 		{
-			name:      "cis-1.3 no etcd",
-			benchmark: "cis-1.3",
-			targets:   []string{"master", "etcd"},
+			name:      "cis-1.5 no dummy",
+			benchmark: "cis-1.5",
+			targets:   []string{"master", "node", "controlplane", "etcd", "dummy"},
 			expected:  false,
 		},
 		{
-			name:      "cis-1.4 valid",
-			benchmark: "cis-1.4",
-			targets:   []string{"master", "node"},
+			name:      "cis-1.5 valid",
+			benchmark: "cis-1.5",
+			targets:   []string{"master", "node", "controlplane", "etcd", "policies"},
 			expected:  true,
 		},
 		{
-			name:      "cis-1.5 no dummy",
-			benchmark: "cis-1.5",
-			targets:   []string{"master", "node", "controlplane", "etcd", "dummy"},
+			name:      "cis-1.6 no Pikachu",
+			benchmark: "cis-1.6",
+			targets:   []string{"master", "node", "controlplane", "etcd", "Pikachu"},
 			expected:  false,
 		},
 		{
-			name:      "cis-1.5 valid",
-			benchmark: "cis-1.5",
+			name:      "cis-1.6 valid",
+			benchmark: "cis-1.6",
 			targets:   []string{"master", "node", "controlplane", "etcd", "policies"},
 			expected:  true,
 		},
diff --git a/integration/integration_test.go b/integration/integration_test.go
index 546331f..fb57822 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -80,18 +80,14 @@ func testCheckCISWithKind(t *testing.T, testdataDir string) {
 	}
 }
 
-func TestCheckCIS13WithKind(t *testing.T) {
-	testCheckCISWithKind(t, "cis-1.3")
-}
-
-func TestCheckCIS14WithKind(t *testing.T) {
-	testCheckCISWithKind(t, "cis-1.4")
-}
-
 func TestCheckCIS15WithKind(t *testing.T) {
 	testCheckCISWithKind(t, "cis-1.5")
 }
 
+func TestCheckCIS16WithKind(t *testing.T) {
+	testCheckCISWithKind(t, "cis-1.6")
+}
+
 // This is simple "diff" between 2 strings containing multiple lines.
 // It's not a comprehensive diff between the 2 strings.
 // It does not inditcate when lines are deleted.
diff --git a/integration/testdata/cis-1.5/add-tls-kind.yaml b/integration/testdata/cis-1.5/add-tls-kind.yaml
index d81fdb3..ac5db31 100644
--- a/integration/testdata/cis-1.5/add-tls-kind.yaml
+++ b/integration/testdata/cis-1.5/add-tls-kind.yaml
@@ -16,4 +16,4 @@ kubeadmConfigPatchesJson6902:
 nodes:
   # the control plane node config
   - role: control-plane
-    image: "kindest/node:v1.18.0"
+    image: "kindest/node:v1.15.0"
diff --git a/integration/testdata/cis-1.6/add-tls-kind.yaml b/integration/testdata/cis-1.6/add-tls-kind.yaml
new file mode 100644
index 0000000..d81fdb3
--- /dev/null
+++ b/integration/testdata/cis-1.6/add-tls-kind.yaml
@@ -0,0 +1,19 @@
+---
+apiVersion: kind.sigs.k8s.io/v1alpha3
+kind: Cluster
+networking:
+  apiServerAddress: "0.0.0.0"
+
+kubeadmConfigPatchesJson6902:
+  - group: kubelet.config.k8s.io
+    version: v1beta1
+    kind: KubeletConfiguration
+    patch: |
+      - op: add
+        path: /tlsCipherSuites
+        value: ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"]
+
+nodes:
+  # the control plane node config
+  - role: control-plane
+    image: "kindest/node:v1.18.0"
diff --git a/integration/testdata/cis-1.6/job-master.data b/integration/testdata/cis-1.6/job-master.data
new file mode 100644
index 0000000..f4ddebf
--- /dev/null
+++ b/integration/testdata/cis-1.6/job-master.data
@@ -0,0 +1,183 @@
+[INFO] 1 Master Node Security Configuration
+[INFO] 1.1 Master Node Configuration Files
+[PASS] 1.1.1 Ensure that the API server pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.2 Ensure that the API server pod specification file ownership is set to root:root (Automated)
+[PASS] 1.1.3 Ensure that the controller manager pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.4 Ensure that the controller manager pod specification file ownership is set to root:root (Automated)
+[PASS] 1.1.5 Ensure that the scheduler pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.6 Ensure that the scheduler pod specification file ownership is set to root:root (Automated)
+[PASS] 1.1.7 Ensure that the etcd pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.8 Ensure that the etcd pod specification file ownership is set to root:root (Automated)
+[WARN] 1.1.9 Ensure that the Container Network Interface file permissions are set to 644 or more restrictive (Manual)
+[WARN] 1.1.10 Ensure that the Container Network Interface file ownership is set to root:root (Manual)
+[PASS] 1.1.11 Ensure that the etcd data directory permissions are set to 700 or more restrictive (Automated)
+[FAIL] 1.1.12 Ensure that the etcd data directory ownership is set to etcd:etcd (Automated)
+[PASS] 1.1.13 Ensure that the admin.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.14 Ensure that the admin.conf file ownership is set to root:root (Automated)
+[PASS] 1.1.15 Ensure that the scheduler.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.16 Ensure that the scheduler.conf file ownership is set to root:root (Automated)
+[PASS] 1.1.17 Ensure that the controller-manager.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.18 Ensure that the controller-manager.conf file ownership is set to root:root (Automated)
+[FAIL] 1.1.19 Ensure that the Kubernetes PKI directory and file ownership is set to root:root (Automated)
+[PASS] 1.1.20 Ensure that the Kubernetes PKI certificate file permissions are set to 644 or more restrictive (Manual)
+[PASS] 1.1.21 Ensure that the Kubernetes PKI key file permissions are set to 600 (Manual)
+[INFO] 1.2 API Server
+[WARN] 1.2.1 Ensure that the --anonymous-auth argument is set to false (Manual)
+[PASS] 1.2.2 Ensure that the --basic-auth-file argument is not set (Automated)
+[PASS] 1.2.3 Ensure that the --token-auth-file parameter is not set (Automated)
+[PASS] 1.2.4 Ensure that the --kubelet-https argument is set to true (Automated)
+[PASS] 1.2.5 Ensure that the --kubelet-client-certificate and --kubelet-client-key arguments are set as appropriate (Automated)
+[FAIL] 1.2.6 Ensure that the --kubelet-certificate-authority argument is set as appropriate (Automated)
+[PASS] 1.2.7 Ensure that the --authorization-mode argument is not set to AlwaysAllow (Automated)
+[PASS] 1.2.8 Ensure that the --authorization-mode argument includes Node (Automated)
+[PASS] 1.2.9 Ensure that the --authorization-mode argument includes RBAC (Automated)
+[WARN] 1.2.10 Ensure that the admission control plugin EventRateLimit is set (Manual)
+[PASS] 1.2.11 Ensure that the admission control plugin AlwaysAdmit is not set (Automated)
+[WARN] 1.2.12 Ensure that the admission control plugin AlwaysPullImages is set (Manual)
+[WARN] 1.2.13 Ensure that the admission control plugin SecurityContextDeny is set if PodSecurityPolicy is not used (Manual)
+[PASS] 1.2.14 Ensure that the admission control plugin ServiceAccount is set (Automated)
+[PASS] 1.2.15 Ensure that the admission control plugin NamespaceLifecycle is set (Automated)
+[FAIL] 1.2.16 Ensure that the admission control plugin PodSecurityPolicy is set (Automated)
+[PASS] 1.2.17 Ensure that the admission control plugin NodeRestriction is set (Automated)
+[PASS] 1.2.18 Ensure that the --insecure-bind-address argument is not set (Automated)
+[PASS] 1.2.19 Ensure that the --insecure-port argument is set to 0 (Automated)
+[PASS] 1.2.20 Ensure that the --secure-port argument is not set to 0 (Automated)
+[FAIL] 1.2.21 Ensure that the --profiling argument is set to false (Automated)
+[FAIL] 1.2.22 Ensure that the --audit-log-path argument is set (Automated)
+[FAIL] 1.2.23 Ensure that the --audit-log-maxage argument is set to 30 or as appropriate (Automated)
+[FAIL] 1.2.24 Ensure that the --audit-log-maxbackup argument is set to 10 or as appropriate (Automated)
+[FAIL] 1.2.25 Ensure that the --audit-log-maxsize argument is set to 100 or as appropriate (Automated)
+[PASS] 1.2.26 Ensure that the --request-timeout argument is set as appropriate (Automated)
+[PASS] 1.2.27 Ensure that the --service-account-lookup argument is set to true (Automated)
+[PASS] 1.2.28 Ensure that the --service-account-key-file argument is set as appropriate (Automated)
+[PASS] 1.2.29 Ensure that the --etcd-certfile and --etcd-keyfile arguments are set as appropriate (Automated)
+[PASS] 1.2.30 Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Automated)
+[PASS] 1.2.31 Ensure that the --client-ca-file argument is set as appropriate (Automated)
+[PASS] 1.2.32 Ensure that the --etcd-cafile argument is set as appropriate (Automated)
+[WARN] 1.2.33 Ensure that the --encryption-provider-config argument is set as appropriate (Manual)
+[WARN] 1.2.34 Ensure that encryption providers are appropriately configured (Manual)
+[WARN] 1.2.35 Ensure that the API Server only makes use of Strong Cryptographic Ciphers (Manual)
+[INFO] 1.3 Controller Manager
+[WARN] 1.3.1 Ensure that the --terminated-pod-gc-threshold argument is set as appropriate (Manual)
+[FAIL] 1.3.2 Ensure that the --profiling argument is set to false (Automated)
+[PASS] 1.3.3 Ensure that the --use-service-account-credentials argument is set to true (Automated)
+[PASS] 1.3.4 Ensure that the --service-account-private-key-file argument is set as appropriate (Automated)
+[PASS] 1.3.5 Ensure that the --root-ca-file argument is set as appropriate (Automated)
+[FAIL] 1.3.6 Ensure that the RotateKubeletServerCertificate argument is set to true (Automated)
+[PASS] 1.3.7 Ensure that the --bind-address argument is set to 127.0.0.1 (Automated)
+[INFO] 1.4 Scheduler
+[FAIL] 1.4.1 Ensure that the --profiling argument is set to false (Automated)
+[PASS] 1.4.2 Ensure that the --bind-address argument is set to 127.0.0.1 (Automated)
+
+== Remediations ==
+1.1.9 Run the below command (based on the file location on your system) on the master node.
+For example,
+chmod 644 <path/to/cni/files>
+
+1.1.10 Run the below command (based on the file location on your system) on the master node.
+For example,
+chown root:root <path/to/cni/files>
+
+1.1.12 On the etcd server node, get the etcd data directory, passed as an argument --data-dir,
+from the below command:
+ps -ef | grep etcd
+Run the below command (based on the etcd data directory found above).
+For example, chown etcd:etcd /var/lib/etcd
+
+1.1.19 Run the below command (based on the file location on your system) on the master node.
+For example,
+chown -R root:root /etc/kubernetes/pki/
+
+1.2.1 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the below parameter.
+--anonymous-auth=false
+
+1.2.6 Follow the Kubernetes documentation and setup the TLS connection between
+the apiserver and kubelets. Then, edit the API server pod specification file
+/etc/kubernetes/manifests/kube-apiserver.yaml on the master node and set the
+--kubelet-certificate-authority parameter to the path to the cert file for the certificate authority.
+--kubelet-certificate-authority=<ca-string>
+
+1.2.10 Follow the Kubernetes documentation and set the desired limits in a configuration file.
+Then, edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+and set the below parameters.
+--enable-admission-plugins=...,EventRateLimit,...
+--admission-control-config-file=<path/to/configuration/file>
+
+1.2.12 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --enable-admission-plugins parameter to include
+AlwaysPullImages.
+--enable-admission-plugins=...,AlwaysPullImages,...
+
+1.2.13 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --enable-admission-plugins parameter to include
+SecurityContextDeny, unless PodSecurityPolicy is already in place.
+--enable-admission-plugins=...,SecurityContextDeny,...
+
+1.2.16 Follow the documentation and create Pod Security Policy objects as per your environment.
+Then, edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --enable-admission-plugins parameter to a
+value that includes PodSecurityPolicy:
+--enable-admission-plugins=...,PodSecurityPolicy,...
+Then restart the API Server.
+
+1.2.21 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the below parameter.
+--profiling=false
+
+1.2.22 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-path parameter to a suitable path and
+file where you would like audit logs to be written, for example:
+--audit-log-path=/var/log/apiserver/audit.log
+
+1.2.23 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-maxage parameter to 30 or as an appropriate number of days:
+--audit-log-maxage=30
+
+1.2.24 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-maxbackup parameter to 10 or to an appropriate
+value.
+--audit-log-maxbackup=10
+
+1.2.25 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-maxsize parameter to an appropriate size in MB.
+For example, to set it as 100 MB:
+--audit-log-maxsize=100
+
+1.2.33 Follow the Kubernetes documentation and configure a EncryptionConfig file.
+Then, edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --encryption-provider-config parameter to the path of that file: --encryption-provider-config=</path/to/EncryptionConfig/File>
+
+1.2.34 Follow the Kubernetes documentation and configure a EncryptionConfig file.
+In this file, choose aescbc, kms or secretbox as the encryption provider.
+
+1.2.35 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the below parameter.
+--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM
+_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM
+_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM
+_SHA384
+
+1.3.1 Edit the Controller Manager pod specification file /etc/kubernetes/manifests/kube-controller-manager.yaml
+on the master node and set the --terminated-pod-gc-threshold to an appropriate threshold,
+for example:
+--terminated-pod-gc-threshold=10
+
+1.3.2 Edit the Controller Manager pod specification file /etc/kubernetes/manifests/kube-controller-manager.yaml
+on the master node and set the below parameter.
+--profiling=false
+
+1.3.6 Edit the Controller Manager pod specification file /etc/kubernetes/manifests/kube-controller-manager.yaml
+on the master node and set the --feature-gates parameter to include RotateKubeletServerCertificate=true.
+--feature-gates=RotateKubeletServerCertificate=true
+
+1.4.1 Edit the Scheduler pod specification file /etc/kubernetes/manifests/kube-scheduler.yaml file
+on the master node and set the below parameter.
+--profiling=false
+
+
+== Summary ==
+43 checks PASS
+12 checks FAIL
+10 checks WARN
+0 checks INFO
diff --git a/integration/testdata/cis-1.6/job-node.data b/integration/testdata/cis-1.6/job-node.data
new file mode 100644
index 0000000..942c7a4
--- /dev/null
+++ b/integration/testdata/cis-1.6/job-node.data
@@ -0,0 +1,77 @@
+[INFO] 4 Worker Node Security Configuration
+[INFO] 4.1 Worker Node Configuration Files
+[PASS] 4.1.1 Ensure that the kubelet service file permissions are set to 644 or more restrictive (Automated)
+[PASS] 4.1.2 Ensure that the kubelet service file ownership is set to root:root (Automated)
+[WARN] 4.1.3 If proxy kubeconfig file exists ensure permissions are set to 644 or more restrictive (Manual)
+[WARN] 4.1.4 Ensure that the proxy kubeconfig file ownership is set to root:root (Manual)
+[PASS] 4.1.5 Ensure that the --kubeconfig kubelet.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 4.1.6 Ensure that the --kubeconfig kubelet.conf file ownership is set to root:root (Manual)
+[PASS] 4.1.7 Ensure that the certificate authorities file permissions are set to 644 or more restrictive (Manual)
+[PASS] 4.1.8 Ensure that the client certificate authorities file ownership is set to root:root (Manual)
+[PASS] 4.1.9 Ensure that the kubelet --config configuration file has permissions set to 644 or more restrictive (Automated)
+[PASS] 4.1.10 Ensure that the kubelet --config configuration file ownership is set to root:root (Automated)
+[INFO] 4.2 Kubelet
+[PASS] 4.2.1 Ensure that the anonymous-auth argument is set to false (Automated)
+[PASS] 4.2.2 Ensure that the --authorization-mode argument is not set to AlwaysAllow (Automated)
+[PASS] 4.2.3 Ensure that the --client-ca-file argument is set as appropriate (Automated)
+[PASS] 4.2.4 Ensure that the --read-only-port argument is set to 0 (Manual)
+[PASS] 4.2.5 Ensure that the --streaming-connection-idle-timeout argument is not set to 0 (Manual)
+[FAIL] 4.2.6 Ensure that the --protect-kernel-defaults argument is set to true (Automated)
+[PASS] 4.2.7 Ensure that the --make-iptables-util-chains argument is set to true (Automated)
+[PASS] 4.2.8 Ensure that the --hostname-override argument is not set (Manual)
+[WARN] 4.2.9 Ensure that the --event-qps argument is set to 0 or a level which ensures appropriate event capture (Manual)
+[WARN] 4.2.10 Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Manual)
+[PASS] 4.2.11 Ensure that the --rotate-certificates argument is not set to false (Manual)
+[WARN] 4.2.12 Verify that the RotateKubeletServerCertificate argument is set to true (Manual)
+[PASS] 4.2.13 Ensure that the Kubelet only makes use of Strong Cryptographic Ciphers (Manual)
+
+== Remediations ==
+4.1.3 Run the below command (based on the file location on your system) on the each worker node.
+For example,
+chmod 644 /etc/kubernetes/proxy.conf
+
+4.1.4 Run the below command (based on the file location on your system) on the each worker node.
+For example, chown root:root /etc/kubernetes/proxy.conf
+
+4.2.6 If using a Kubelet config file, edit the file to set protectKernelDefaults: true.
+If using command line arguments, edit the kubelet service file
+/etc/systemd/system/kubelet.service.d/10-kubeadm.conf 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:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+4.2.9 If using a Kubelet config file, edit the file to set eventRecordQPS: to an appropriate level.
+If using command line arguments, edit the kubelet service file
+/etc/systemd/system/kubelet.service.d/10-kubeadm.conf on each worker node and
+set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
+Based on your system, restart the kubelet service. For example:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+4.2.10 If using a Kubelet config file, edit the file to set tlsCertFile to the location
+of the certificate 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
+/etc/systemd/system/kubelet.service.d/10-kubeadm.conf on each worker node and
+set the below parameters in KUBELET_CERTIFICATE_ARGS variable.
+--tls-cert-file=<path/to/tls-certificate-file>
+--tls-private-key-file=<path/to/tls-key-file>
+Based on your system, restart the kubelet service. For example:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+4.2.12 Edit the kubelet service file /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+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:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+
+== Summary ==
+17 checks PASS
+1 checks FAIL
+5 checks WARN
+0 checks INFO
diff --git a/integration/testdata/cis-1.6/job.data b/integration/testdata/cis-1.6/job.data
new file mode 100644
index 0000000..bf5d50f
--- /dev/null
+++ b/integration/testdata/cis-1.6/job.data
@@ -0,0 +1,431 @@
+[INFO] 1 Master Node Security Configuration
+[INFO] 1.1 Master Node Configuration Files
+[PASS] 1.1.1 Ensure that the API server pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.2 Ensure that the API server pod specification file ownership is set to root:root (Automated)
+[PASS] 1.1.3 Ensure that the controller manager pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.4 Ensure that the controller manager pod specification file ownership is set to root:root (Automated)
+[PASS] 1.1.5 Ensure that the scheduler pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.6 Ensure that the scheduler pod specification file ownership is set to root:root (Automated)
+[PASS] 1.1.7 Ensure that the etcd pod specification file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.8 Ensure that the etcd pod specification file ownership is set to root:root (Automated)
+[WARN] 1.1.9 Ensure that the Container Network Interface file permissions are set to 644 or more restrictive (Manual)
+[WARN] 1.1.10 Ensure that the Container Network Interface file ownership is set to root:root (Manual)
+[PASS] 1.1.11 Ensure that the etcd data directory permissions are set to 700 or more restrictive (Automated)
+[FAIL] 1.1.12 Ensure that the etcd data directory ownership is set to etcd:etcd (Automated)
+[PASS] 1.1.13 Ensure that the admin.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.14 Ensure that the admin.conf file ownership is set to root:root (Automated)
+[PASS] 1.1.15 Ensure that the scheduler.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.16 Ensure that the scheduler.conf file ownership is set to root:root (Automated)
+[PASS] 1.1.17 Ensure that the controller-manager.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 1.1.18 Ensure that the controller-manager.conf file ownership is set to root:root (Automated)
+[FAIL] 1.1.19 Ensure that the Kubernetes PKI directory and file ownership is set to root:root (Automated)
+[PASS] 1.1.20 Ensure that the Kubernetes PKI certificate file permissions are set to 644 or more restrictive (Manual)
+[PASS] 1.1.21 Ensure that the Kubernetes PKI key file permissions are set to 600 (Manual)
+[INFO] 1.2 API Server
+[WARN] 1.2.1 Ensure that the --anonymous-auth argument is set to false (Manual)
+[PASS] 1.2.2 Ensure that the --basic-auth-file argument is not set (Automated)
+[PASS] 1.2.3 Ensure that the --token-auth-file parameter is not set (Automated)
+[PASS] 1.2.4 Ensure that the --kubelet-https argument is set to true (Automated)
+[PASS] 1.2.5 Ensure that the --kubelet-client-certificate and --kubelet-client-key arguments are set as appropriate (Automated)
+[FAIL] 1.2.6 Ensure that the --kubelet-certificate-authority argument is set as appropriate (Automated)
+[PASS] 1.2.7 Ensure that the --authorization-mode argument is not set to AlwaysAllow (Automated)
+[PASS] 1.2.8 Ensure that the --authorization-mode argument includes Node (Automated)
+[PASS] 1.2.9 Ensure that the --authorization-mode argument includes RBAC (Automated)
+[WARN] 1.2.10 Ensure that the admission control plugin EventRateLimit is set (Manual)
+[PASS] 1.2.11 Ensure that the admission control plugin AlwaysAdmit is not set (Automated)
+[WARN] 1.2.12 Ensure that the admission control plugin AlwaysPullImages is set (Manual)
+[WARN] 1.2.13 Ensure that the admission control plugin SecurityContextDeny is set if PodSecurityPolicy is not used (Manual)
+[PASS] 1.2.14 Ensure that the admission control plugin ServiceAccount is set (Automated)
+[PASS] 1.2.15 Ensure that the admission control plugin NamespaceLifecycle is set (Automated)
+[FAIL] 1.2.16 Ensure that the admission control plugin PodSecurityPolicy is set (Automated)
+[PASS] 1.2.17 Ensure that the admission control plugin NodeRestriction is set (Automated)
+[PASS] 1.2.18 Ensure that the --insecure-bind-address argument is not set (Automated)
+[PASS] 1.2.19 Ensure that the --insecure-port argument is set to 0 (Automated)
+[PASS] 1.2.20 Ensure that the --secure-port argument is not set to 0 (Automated)
+[FAIL] 1.2.21 Ensure that the --profiling argument is set to false (Automated)
+[FAIL] 1.2.22 Ensure that the --audit-log-path argument is set (Automated)
+[FAIL] 1.2.23 Ensure that the --audit-log-maxage argument is set to 30 or as appropriate (Automated)
+[FAIL] 1.2.24 Ensure that the --audit-log-maxbackup argument is set to 10 or as appropriate (Automated)
+[FAIL] 1.2.25 Ensure that the --audit-log-maxsize argument is set to 100 or as appropriate (Automated)
+[PASS] 1.2.26 Ensure that the --request-timeout argument is set as appropriate (Automated)
+[PASS] 1.2.27 Ensure that the --service-account-lookup argument is set to true (Automated)
+[PASS] 1.2.28 Ensure that the --service-account-key-file argument is set as appropriate (Automated)
+[PASS] 1.2.29 Ensure that the --etcd-certfile and --etcd-keyfile arguments are set as appropriate (Automated)
+[PASS] 1.2.30 Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Automated)
+[PASS] 1.2.31 Ensure that the --client-ca-file argument is set as appropriate (Automated)
+[PASS] 1.2.32 Ensure that the --etcd-cafile argument is set as appropriate (Automated)
+[WARN] 1.2.33 Ensure that the --encryption-provider-config argument is set as appropriate (Manual)
+[WARN] 1.2.34 Ensure that encryption providers are appropriately configured (Manual)
+[WARN] 1.2.35 Ensure that the API Server only makes use of Strong Cryptographic Ciphers (Manual)
+[INFO] 1.3 Controller Manager
+[WARN] 1.3.1 Ensure that the --terminated-pod-gc-threshold argument is set as appropriate (Manual)
+[FAIL] 1.3.2 Ensure that the --profiling argument is set to false (Automated)
+[PASS] 1.3.3 Ensure that the --use-service-account-credentials argument is set to true (Automated)
+[PASS] 1.3.4 Ensure that the --service-account-private-key-file argument is set as appropriate (Automated)
+[PASS] 1.3.5 Ensure that the --root-ca-file argument is set as appropriate (Automated)
+[FAIL] 1.3.6 Ensure that the RotateKubeletServerCertificate argument is set to true (Automated)
+[PASS] 1.3.7 Ensure that the --bind-address argument is set to 127.0.0.1 (Automated)
+[INFO] 1.4 Scheduler
+[FAIL] 1.4.1 Ensure that the --profiling argument is set to false (Automated)
+[PASS] 1.4.2 Ensure that the --bind-address argument is set to 127.0.0.1 (Automated)
+
+== Remediations ==
+1.1.9 Run the below command (based on the file location on your system) on the master node.
+For example,
+chmod 644 <path/to/cni/files>
+
+1.1.10 Run the below command (based on the file location on your system) on the master node.
+For example,
+chown root:root <path/to/cni/files>
+
+1.1.12 On the etcd server node, get the etcd data directory, passed as an argument --data-dir,
+from the below command:
+ps -ef | grep etcd
+Run the below command (based on the etcd data directory found above).
+For example, chown etcd:etcd /var/lib/etcd
+
+1.1.19 Run the below command (based on the file location on your system) on the master node.
+For example,
+chown -R root:root /etc/kubernetes/pki/
+
+1.2.1 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the below parameter.
+--anonymous-auth=false
+
+1.2.6 Follow the Kubernetes documentation and setup the TLS connection between
+the apiserver and kubelets. Then, edit the API server pod specification file
+/etc/kubernetes/manifests/kube-apiserver.yaml on the master node and set the
+--kubelet-certificate-authority parameter to the path to the cert file for the certificate authority.
+--kubelet-certificate-authority=<ca-string>
+
+1.2.10 Follow the Kubernetes documentation and set the desired limits in a configuration file.
+Then, edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+and set the below parameters.
+--enable-admission-plugins=...,EventRateLimit,...
+--admission-control-config-file=<path/to/configuration/file>
+
+1.2.12 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --enable-admission-plugins parameter to include
+AlwaysPullImages.
+--enable-admission-plugins=...,AlwaysPullImages,...
+
+1.2.13 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --enable-admission-plugins parameter to include
+SecurityContextDeny, unless PodSecurityPolicy is already in place.
+--enable-admission-plugins=...,SecurityContextDeny,...
+
+1.2.16 Follow the documentation and create Pod Security Policy objects as per your environment.
+Then, edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --enable-admission-plugins parameter to a
+value that includes PodSecurityPolicy:
+--enable-admission-plugins=...,PodSecurityPolicy,...
+Then restart the API Server.
+
+1.2.21 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the below parameter.
+--profiling=false
+
+1.2.22 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-path parameter to a suitable path and
+file where you would like audit logs to be written, for example:
+--audit-log-path=/var/log/apiserver/audit.log
+
+1.2.23 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-maxage parameter to 30 or as an appropriate number of days:
+--audit-log-maxage=30
+
+1.2.24 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-maxbackup parameter to 10 or to an appropriate
+value.
+--audit-log-maxbackup=10
+
+1.2.25 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --audit-log-maxsize parameter to an appropriate size in MB.
+For example, to set it as 100 MB:
+--audit-log-maxsize=100
+
+1.2.33 Follow the Kubernetes documentation and configure a EncryptionConfig file.
+Then, edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the --encryption-provider-config parameter to the path of that file: --encryption-provider-config=</path/to/EncryptionConfig/File>
+
+1.2.34 Follow the Kubernetes documentation and configure a EncryptionConfig file.
+In this file, choose aescbc, kms or secretbox as the encryption provider.
+
+1.2.35 Edit the API server pod specification file /etc/kubernetes/manifests/kube-apiserver.yaml
+on the master node and set the below parameter.
+--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM
+_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM
+_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM
+_SHA384
+
+1.3.1 Edit the Controller Manager pod specification file /etc/kubernetes/manifests/kube-controller-manager.yaml
+on the master node and set the --terminated-pod-gc-threshold to an appropriate threshold,
+for example:
+--terminated-pod-gc-threshold=10
+
+1.3.2 Edit the Controller Manager pod specification file /etc/kubernetes/manifests/kube-controller-manager.yaml
+on the master node and set the below parameter.
+--profiling=false
+
+1.3.6 Edit the Controller Manager pod specification file /etc/kubernetes/manifests/kube-controller-manager.yaml
+on the master node and set the --feature-gates parameter to include RotateKubeletServerCertificate=true.
+--feature-gates=RotateKubeletServerCertificate=true
+
+1.4.1 Edit the Scheduler pod specification file /etc/kubernetes/manifests/kube-scheduler.yaml file
+on the master node and set the below parameter.
+--profiling=false
+
+
+== Summary ==
+43 checks PASS
+12 checks FAIL
+10 checks WARN
+0 checks INFO
+[INFO] 2 Etcd Node Configuration
+[INFO] 2 Etcd Node Configuration Files
+[PASS] 2.1 Ensure that the --cert-file and --key-file arguments are set as appropriate (Automated)
+[PASS] 2.2 Ensure that the --client-cert-auth argument is set to true (Automated)
+[PASS] 2.3 Ensure that the --auto-tls argument is not set to true (Automated)
+[PASS] 2.4 Ensure that the --peer-cert-file and --peer-key-file arguments are set as appropriate (Automated)
+[PASS] 2.5 Ensure that the --peer-client-cert-auth argument is set to true (Automated)
+[PASS] 2.6 Ensure that the --peer-auto-tls argument is not set to true (Automated)
+[PASS] 2.7 Ensure that a unique Certificate Authority is used for etcd (Manual)
+
+== Summary ==
+7 checks PASS
+0 checks FAIL
+0 checks WARN
+0 checks INFO
+[INFO] 3 Control Plane Configuration
+[INFO] 3.1 Authentication and Authorization
+[WARN] 3.1.1 Client certificate authentication should not be used for users (Manual)
+[INFO] 3.2 Logging
+[WARN] 3.2.1 Ensure that a minimal audit policy is created (Manual)
+[WARN] 3.2.2 Ensure that the audit policy covers key security concerns (Manual)
+
+== Remediations ==
+3.1.1 Alternative mechanisms provided by Kubernetes such as the use of OIDC should be
+implemented in place of client certificates.
+
+3.2.1 Create an audit policy file for your cluster.
+
+3.2.2 Consider modification of the audit policy in use on the cluster to include these items, at a
+minimum.
+
+
+== Summary ==
+0 checks PASS
+0 checks FAIL
+3 checks WARN
+0 checks INFO
+[INFO] 4 Worker Node Security Configuration
+[INFO] 4.1 Worker Node Configuration Files
+[PASS] 4.1.1 Ensure that the kubelet service file permissions are set to 644 or more restrictive (Automated)
+[PASS] 4.1.2 Ensure that the kubelet service file ownership is set to root:root (Automated)
+[WARN] 4.1.3 If proxy kubeconfig file exists ensure permissions are set to 644 or more restrictive (Manual)
+[WARN] 4.1.4 Ensure that the proxy kubeconfig file ownership is set to root:root (Manual)
+[PASS] 4.1.5 Ensure that the --kubeconfig kubelet.conf file permissions are set to 644 or more restrictive (Automated)
+[PASS] 4.1.6 Ensure that the --kubeconfig kubelet.conf file ownership is set to root:root (Manual)
+[PASS] 4.1.7 Ensure that the certificate authorities file permissions are set to 644 or more restrictive (Manual)
+[PASS] 4.1.8 Ensure that the client certificate authorities file ownership is set to root:root (Manual)
+[PASS] 4.1.9 Ensure that the kubelet --config configuration file has permissions set to 644 or more restrictive (Automated)
+[PASS] 4.1.10 Ensure that the kubelet --config configuration file ownership is set to root:root (Automated)
+[INFO] 4.2 Kubelet
+[PASS] 4.2.1 Ensure that the anonymous-auth argument is set to false (Automated)
+[PASS] 4.2.2 Ensure that the --authorization-mode argument is not set to AlwaysAllow (Automated)
+[PASS] 4.2.3 Ensure that the --client-ca-file argument is set as appropriate (Automated)
+[PASS] 4.2.4 Ensure that the --read-only-port argument is set to 0 (Manual)
+[PASS] 4.2.5 Ensure that the --streaming-connection-idle-timeout argument is not set to 0 (Manual)
+[FAIL] 4.2.6 Ensure that the --protect-kernel-defaults argument is set to true (Automated)
+[PASS] 4.2.7 Ensure that the --make-iptables-util-chains argument is set to true (Automated)
+[PASS] 4.2.8 Ensure that the --hostname-override argument is not set (Manual)
+[WARN] 4.2.9 Ensure that the --event-qps argument is set to 0 or a level which ensures appropriate event capture (Manual)
+[WARN] 4.2.10 Ensure that the --tls-cert-file and --tls-private-key-file arguments are set as appropriate (Manual)
+[PASS] 4.2.11 Ensure that the --rotate-certificates argument is not set to false (Manual)
+[WARN] 4.2.12 Verify that the RotateKubeletServerCertificate argument is set to true (Manual)
+[PASS] 4.2.13 Ensure that the Kubelet only makes use of Strong Cryptographic Ciphers (Manual)
+
+== Remediations ==
+4.1.3 Run the below command (based on the file location on your system) on the each worker node.
+For example,
+chmod 644 /etc/kubernetes/proxy.conf
+
+4.1.4 Run the below command (based on the file location on your system) on the each worker node.
+For example, chown root:root /etc/kubernetes/proxy.conf
+
+4.2.6 If using a Kubelet config file, edit the file to set protectKernelDefaults: true.
+If using command line arguments, edit the kubelet service file
+/etc/systemd/system/kubelet.service.d/10-kubeadm.conf 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:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+4.2.9 If using a Kubelet config file, edit the file to set eventRecordQPS: to an appropriate level.
+If using command line arguments, edit the kubelet service file
+/etc/systemd/system/kubelet.service.d/10-kubeadm.conf on each worker node and
+set the below parameter in KUBELET_SYSTEM_PODS_ARGS variable.
+Based on your system, restart the kubelet service. For example:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+4.2.10 If using a Kubelet config file, edit the file to set tlsCertFile to the location
+of the certificate 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
+/etc/systemd/system/kubelet.service.d/10-kubeadm.conf on each worker node and
+set the below parameters in KUBELET_CERTIFICATE_ARGS variable.
+--tls-cert-file=<path/to/tls-certificate-file>
+--tls-private-key-file=<path/to/tls-key-file>
+Based on your system, restart the kubelet service. For example:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+4.2.12 Edit the kubelet service file /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+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:
+systemctl daemon-reload
+systemctl restart kubelet.service
+
+
+== Summary ==
+17 checks PASS
+1 checks FAIL
+5 checks WARN
+0 checks INFO
+[INFO] 5 Kubernetes Policies
+[INFO] 5.1 RBAC and Service Accounts
+[WARN] 5.1.1 Ensure that the cluster-admin role is only used where required (Manual)
+[WARN] 5.1.2 Minimize access to secrets (Manual)
+[WARN] 5.1.3 Minimize wildcard use in Roles and ClusterRoles (Manual)
+[WARN] 5.1.4 Minimize access to create pods (Manual)
+[WARN] 5.1.5 Ensure that default service accounts are not actively used. (Manual)
+[WARN] 5.1.6 Ensure that Service Account Tokens are only mounted where necessary (Manual)
+[INFO] 5.2 Pod Security Policies
+[WARN] 5.2.1 Minimize the admission of privileged containers (Manual)
+[WARN] 5.2.2 Minimize the admission of containers wishing to share the host process ID namespace (Manual)
+[WARN] 5.2.3 Minimize the admission of containers wishing to share the host IPC namespace (Manual)
+[WARN] 5.2.4 Minimize the admission of containers wishing to share the host network namespace (Manual)
+[WARN] 5.2.5 Minimize the admission of containers with allowPrivilegeEscalation (Manual)
+[WARN] 5.2.6 Minimize the admission of root containers (Manual)
+[WARN] 5.2.7 Minimize the admission of containers with the NET_RAW capability (Manual)
+[WARN] 5.2.8 Minimize the admission of containers with added capabilities (Manual)
+[WARN] 5.2.9 Minimize the admission of containers with capabilities assigned (Manual)
+[INFO] 5.3 Network Policies and CNI
+[WARN] 5.3.1 Ensure that the CNI in use supports Network Policies (Manual)
+[WARN] 5.3.2 Ensure that all Namespaces have Network Policies defined (Manual)
+[INFO] 5.4 Secrets Management
+[WARN] 5.4.1 Prefer using secrets as files over secrets as environment variables (Manual)
+[WARN] 5.4.2 Consider external secret storage (Manual)
+[INFO] 5.5 Extensible Admission Control
+[WARN] 5.5.1 Configure Image Provenance using ImagePolicyWebhook admission controller (Manual)
+[INFO] 5.7 General Policies
+[WARN] 5.7.1 Create administrative boundaries between resources using namespaces (Manual)
+[WARN] 5.7.2 Ensure that the seccomp profile is set to docker/default in your pod definitions (Manual)
+[WARN] 5.7.3 Apply Security Context to Your Pods and Containers (Manual)
+[WARN] 5.7.4 The default namespace should not be used (Manual)
+
+== Remediations ==
+5.1.1 Identify all clusterrolebindings to the cluster-admin role. Check if they are used and
+if they need this role or if they could use a role with fewer privileges.
+Where possible, first bind users to a lower privileged role and then remove the
+clusterrolebinding to the cluster-admin role :
+kubectl delete clusterrolebinding [name]
+
+5.1.2 Where possible, remove get, list and watch access to secret objects in the cluster.
+
+5.1.3 Where possible replace any use of wildcards in clusterroles and roles with specific
+objects or actions.
+
+5.1.4 Where possible, remove create access to pod objects in the cluster.
+
+5.1.5 Create explicit service accounts wherever a Kubernetes workload requires specific access
+to the Kubernetes API server.
+Modify the configuration of each default service account to include this value
+automountServiceAccountToken: false
+
+5.1.6 Modify the definition of pods and service accounts which do not need to mount service
+account tokens to disable it.
+
+5.2.1 Create a PSP as described in the Kubernetes documentation, ensuring that
+the .spec.privileged field is omitted or set to false.
+
+5.2.2 Create a PSP as described in the Kubernetes documentation, ensuring that the
+.spec.hostPID field is omitted or set to false.
+
+5.2.3 Create a PSP as described in the Kubernetes documentation, ensuring that the
+.spec.hostIPC field is omitted or set to false.
+
+5.2.4 Create a PSP as described in the Kubernetes documentation, ensuring that the
+.spec.hostNetwork field is omitted or set to false.
+
+5.2.5 Create a PSP as described in the Kubernetes documentation, ensuring that the
+.spec.allowPrivilegeEscalation field is omitted or set to false.
+
+5.2.6 Create a PSP as described in the Kubernetes documentation, ensuring that the
+.spec.runAsUser.rule is set to either MustRunAsNonRoot or MustRunAs with the range of
+UIDs not including 0.
+
+5.2.7 Create a PSP as described in the Kubernetes documentation, ensuring that the
+.spec.requiredDropCapabilities is set to include either NET_RAW or ALL.
+
+5.2.8 Ensure that allowedCapabilities is not present in PSPs for the cluster unless
+it is set to an empty array.
+
+5.2.9 Review the use of capabilites in applications runnning on your cluster. Where a namespace
+contains applicaions which do not require any Linux capabities to operate consider adding
+a PSP which forbids the admission of containers which do not drop all capabilities.
+
+5.3.1 If the CNI plugin in use does not support network policies, consideration should be given to
+making use of a different plugin, or finding an alternate mechanism for restricting traffic
+in the Kubernetes cluster.
+
+5.3.2 Follow the documentation and create NetworkPolicy objects as you need them.
+
+5.4.1 if possible, rewrite application code to read secrets from mounted secret files, rather than
+from environment variables.
+
+5.4.2 Refer to the secrets management options offered by your cloud provider or a third-party
+secrets management solution.
+
+5.5.1 Follow the Kubernetes documentation and setup image provenance.
+
+5.7.1 Follow the documentation and create namespaces for objects in your deployment as you need
+them.
+
+5.7.2 Seccomp is an alpha feature currently. By default, all alpha features are disabled. So, you
+would need to enable alpha features in the apiserver by passing "--feature-
+gates=AllAlpha=true" argument.
+Edit the /etc/kubernetes/apiserver file on the master node and set the KUBE_API_ARGS
+parameter to "--feature-gates=AllAlpha=true"
+KUBE_API_ARGS="--feature-gates=AllAlpha=true"
+Based on your system, restart the kube-apiserver service. For example:
+systemctl restart kube-apiserver.service
+Use annotations to enable the docker/default seccomp profile in your pod definitions. An
+example is as below:
+apiVersion: v1
+kind: Pod
+metadata:
+  name: trustworthy-pod
+  annotations:
+    seccomp.security.alpha.kubernetes.io/pod: docker/default
+spec:
+  containers:
+    - name: trustworthy-container
+      image: sotrustworthy:latest
+
+5.7.3 Follow the Kubernetes documentation and apply security contexts to your pods. For a
+suggested list of security contexts, you may refer to the CIS Security Benchmark for Docker
+Containers.
+
+5.7.4 Ensure that namespaces are created to allow for appropriate segregation of Kubernetes
+resources and that all new resources are created in a specific namespace.
+
+
+== Summary ==
+0 checks PASS
+0 checks FAIL
+24 checks WARN
+0 checks INFO