From 2b7b4a3b6580b78f9fecb7f09f338dc956b6d975 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 26 Apr 2018 13:59:14 -0400
Subject: [PATCH] Move openshift-node-config into the node image

Do not remove openshift binary from the node image quite yet.
---
 images/node/scripts/openshift-node | 2 +-
 origin.spec                        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/images/node/scripts/openshift-node b/images/node/scripts/openshift-node
index bf81e942a63c..3f27ccde5d11 100755
--- a/images/node/scripts/openshift-node
+++ b/images/node/scripts/openshift-node
@@ -14,5 +14,5 @@ config=/etc/origin/node/bootstrap-node-config.yaml
 if [[ -f /etc/origin/node/node-config.yaml ]]; then
   config=/etc/origin/node/node-config.yaml
 fi
-flags=$( /usr/bin/openshift start node --write-flags "--config=${config}" --loglevel=${DEBUG_LOGLEVEL:-2} )
+flags=$( /usr/bin/openshift-node-config "--config=${config}" )
 exec /usr/bin/hyperkube kubelet --v=${DEBUG_LOGLEVEL:-2} ${flags}
\ No newline at end of file
diff --git a/origin.spec b/origin.spec
index f6327a4a81ce..d43f9b0af410 100644
--- a/origin.spec
+++ b/origin.spec
@@ -262,7 +262,7 @@ PLATFORM="$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
 install -d %{buildroot}%{_bindir}
 
 # Install linux components
-for bin in oc oadm openshift hypershift hyperkube template-service-broker
+for bin in oc oadm openshift hypershift hyperkube template-service-broker openshift-node-config
 do
   echo "+++ INSTALLING ${bin}"
   install -p -m 755 _output/local/bin/${PLATFORM}/${bin} %{buildroot}%{_bindir}/${bin}
@@ -399,6 +399,7 @@ chmod 0744 $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
 %config(noreplace) %{_sysconfdir}/origin/master
 
 %files node
+%{_bindir}/openshift-node-config
 %{_sysconfdir}/systemd/system.conf.d/origin-accounting.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-node
 %defattr(-,root,root,0700)