fix dind

openshift-sdn was removed from the openshift binary and the new command needs to be invoked by startup scripts.
openshift · Sep 20, 2018 · c12e6db · c12e6db
1 parent 256f7ea
commit c12e6db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/hack/dind-cluster.sh b/hack/dind-cluster.sh
@@ -712,6 +712,7 @@ function copy-runtime() {
   local origin_root=$1
   local target=$2
 
+  cp "$(os::util::find::built_binary openshift-sdn)" "${target}/openshift-sdn-node"
   cp "$(os::util::find::built_binary hyperkube)" "${target}"
   cp "$(os::util::find::built_binary openshift-node-config)" "${target}"
   cp "$(os::util::find::built_binary openshift)" "${target}"

diff --git a/images/dind/node/Dockerfile b/images/dind/node/Dockerfile
@@ -70,6 +70,7 @@ RUN ln -sf /data/openshift /usr/local/bin/ && \
     ln -sf /data/oc        /usr/local/bin/ && \
     ln -sf /data/hyperkube /usr/local/bin/ && \
     ln -sf /data/openshift-node-config /usr/local/bin/ && \
+    ln -sf /data/openshift-sdn-node /usr/local/bin/openshift-sdn-node && \
     ln -sf /data/openshift /usr/local/bin/openshift-deploy && \
     ln -sf /data/openshift /usr/local/bin/openshift-docker-build && \
     ln -sf /data/openshift /usr/local/bin/openshift-sti-build && \

diff --git a/images/dind/node/openshift-sdn-node.sh b/images/dind/node/openshift-sdn-node.sh
@@ -46,7 +46,7 @@ function openshift-sdn-node() {
     oc config --config=${sdn_kube_config} set-context "$( oc config --config=${sdn_kube_config} current-context )" --user=sa
   fi
   # Launch the network process
-  exec openshift-sdn --config=${config_dir}/node-config.yaml --kubeconfig=${sdn_kube_config} --loglevel=${DEBUG_LOGLEVEL:-4}
+  exec openshift-sdn-node --config=${config_dir}/node-config.yaml --kubeconfig=${sdn_kube_config} --loglevel=${DEBUG_LOGLEVEL:-4}
 }
 
 if [[ "${OPENSHIFT_NETWORK_PLUGIN}" =~ ^"redhat/" ]]; then