Merge pull request #233 from aquasecurity/clean-ocp-configs

Clean up OCP benchmark config.

cfg/ocp-3.10/config.yaml

@@ -11,25 +11,20 @@ master:
   apiserver:
     bins:
       - openshift start master api
-    defaultconf: /etc/origin/master/master-config.yaml
 
   scheduler:
     bins:
       - openshift start master controllers
-    defaultconf: /etc/origin/master/master-config.yaml
 
   controllermanager:
     bins:
       - openshift start master controllers
-    defaultconf: /etc/origin/master/master-config.yaml
-
-  etcd:
-    defaultconf: /etc/kubernetes/manifests/etcd.yaml
 
 node:
   kubelet:
-    defaultconf: /etc/kubernetes/kubelet.conf
-    defaultsvc: /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+    bins:
+      - openshift start network
 
   proxy:
-    defaultconf: /etc/kubernetes/addons/kube-proxy-daemonset.yaml
+    bins:
+      - openshift start network

cfg/ocp-3.10/master.yaml

@@ -1043,7 +1043,7 @@ groups:
     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
+      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