Merge pull request aquasecurity#237 from aquasecurity/openshift

Update openshift executable config
pipo02mix · Mar 7, 2019 · c4c0d91 · c4c0d91
2 parents 8745df1 + 9b3628e
commit c4c0d91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git 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

diff --git a/cfg/ocp-3.10/config.yaml b/cfg/ocp-3.10/config.yaml
@@ -10,21 +10,13 @@
 master:
   apiserver:
     bins:
-      - openshift start master api
+      - hypershift openshift-kube-apiserver
 
-  scheduler:
+  etcd:
     bins:
-      - openshift start master controllers
-
-  controllermanager:
-    bins:
-      - openshift start master controllers
+      - openshift start etcd
 
 node:
-  kubelet:
-    bins:
-      - openshift start network
-
   proxy:
     bins:
       - openshift start network