瀏覽代碼

Prepare to split openshift-sdn out of the openshift binary

Detect if the new binary exists in the image before executing it.
Clayton Coleman 6 年之前
父節點
當前提交
7a0551a8af
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      roles/openshift_sdn/files/sdn.yaml

+ 3 - 0
roles/openshift_sdn/files/sdn.yaml

@@ -102,6 +102,9 @@ spec:
           oc config --config=/tmp/kubeconfig set-credentials sa "--token=$( cat /var/run/secrets/kubernetes.io/serviceaccount/token )"
           oc config --config=/tmp/kubeconfig set-context "$( oc config --config=/tmp/kubeconfig current-context )" --user=sa
           # Launch the network process
+          if which openshift-sdn; then
+            exec openshift-sdn --config=/etc/origin/node/node-config.yaml --kubeconfig=/tmp/kubeconfig --loglevel=${DEBUG_LOGLEVEL:-2}
+          fi
           exec openshift start network --config=/etc/origin/node/node-config.yaml --kubeconfig=/tmp/kubeconfig --loglevel=${DEBUG_LOGLEVEL:-2}
 
         securityContext: