Merge pull request #237 from aquasecurity/openshift

Update openshift executable config
Update openshift executable config for #236
2026-02-24 06:44:20 +00:00 · 2019-03-07 14:53:22 +00:00 · 2019-03-07 11:18:06 +00:00 · 2019-03-07 09:30:18 +00:00 · 2019-03-07 09:22:47 +00:00 · 2019-03-06 12:02:58 +00:00
3 changed files with 9 additions and 19 deletions
--- a/cfg/config.yaml
+++ b/cfg/config.yaml
@@ -24,6 +24,7 @@ master:
    bins:
      - "kube-apiserver"
      - "hyperkube apiserver"
+      - "hyperkube kube-apiserver"
      - "apiserver"
    confs:
      - /etc/kubernetes/apiserver.conf
@@ -34,6 +35,7 @@ master:
    bins:
      - "kube-scheduler"
      - "hyperkube scheduler"
+      - "hyperkube kube-scheduler"
      - "scheduler"
    confs: 
      - /etc/kubernetes/scheduler.conf
@@ -44,6 +46,7 @@ master:
    bins:
      - "kube-controller-manager"
      - "hyperkube controller-manager"
+      - "hyperkube kube-controller-manager"
      - "controller-manager"
    confs:
      - /etc/kubernetes/controller-manager.conf
--- a/cfg/ocp-3.10/config.yaml
+++ b/cfg/ocp-3.10/config.yaml
@@ -10,26 +10,13 @@
 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
+      - hypershift openshift-kube-apiserver

  etcd:
-    defaultconf: /etc/kubernetes/manifests/etcd.yaml
+    bins:
+      - openshift start etcd

 node:
-  kubelet:
-    defaultconf: /etc/kubernetes/kubelet.conf
-    defaultsvc: /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
-
  proxy:
-    defaultconf: /etc/kubernetes/addons/kube-proxy-daemonset.yaml
+    bins:
+      - openshift start network
--- a/cfg/ocp-3.10/master.yaml
+++ b/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
Author	SHA1	Message	Date
Liz Rice	c4c0d911d4	Merge pull request #237 from aquasecurity/openshift Update openshift executable config	2019-03-07 14:53:22 +00:00
Liz Rice	9b3628e76a	Update openshift executable config for #236	2019-03-07 11:18:06 +00:00
Liz Rice	8745df170a	Merge pull request #233 from aquasecurity/clean-ocp-configs Clean up OCP benchmark config.	2019-03-07 09:30:18 +00:00
Liz Rice	1ead9e1d71	Merge branch 'master' into clean-ocp-configs	2019-03-07 09:22:47 +00:00
Abubakr-Sadik Nii Nai Davis	53ed68a0b2	Clean up OCP benchmark config. The OCP benchmarks uses configs for only binary component variable names. This commit cleans up the OCP config by removing all configuration except those component binaries required to run kube-bench on OCP installations and adds missing ones.	2019-03-06 12:02:58 +00:00