Merge branch 'master' into fix-235

5 years ago · e3da299e0c
parent 87820b9775 312cdb1c6d
commit e3da299e0c
1 changed files with 11 additions and 0 deletions
--- a/cfg/ocp-3.10/config.yaml
+++ b/cfg/ocp-3.10/config.yaml
@ -4,7 +4,18 @@
 master:
  apiserver:
    bins:
+      - openshift start master api
      - hypershift openshift-kube-apiserver
+     
+  scheduler:
+    bins:
+      - "openshift start master controllers"
+    confs:
+      - /etc/origin/master/scheduler.json
+
+  controllermanager:
+    bins:
+      - "openshift start master controllers"

  etcd:
    bins: