summaryrefslogtreecommitdiffstats
path: root/roles/openshift_cli/library
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-07 09:14:49 -0500
committerScott Dodson <sdodson@redhat.com>2017-12-07 09:51:54 -0500
commit13ca9bbd624b334cab6a7403764e9bba110fc8b3 (patch)
tree7609fbab4c2865bb56454764cca4e1c3380772df /roles/openshift_cli/library
parent4bcb53654635de775c60d0176e3aeeed4856fc86 (diff)
downloadopenshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.tar.gz
openshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.tar.bz2
openshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.tar.xz
openshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.zip
Remove all uses of openshift.common.admin_binary
Replace with `oc adm`
Diffstat (limited to 'roles/openshift_cli/library')
-rw-r--r--roles/openshift_cli/library/openshift_container_binary_sync.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_cli/library/openshift_container_binary_sync.py b/roles/openshift_cli/library/openshift_container_binary_sync.py
index 08045794a..440b8ec28 100644
--- a/roles/openshift_cli/library/openshift_container_binary_sync.py
+++ b/roles/openshift_cli/library/openshift_container_binary_sync.py
@@ -27,7 +27,7 @@ class BinarySyncError(Exception):
# pylint: disable=too-few-public-methods,too-many-instance-attributes
class BinarySyncer(object):
"""
- Syncs the openshift, oc, oadm, and kubectl binaries/symlinks out of
+ Syncs the openshift, oc, and kubectl binaries/symlinks out of
a container onto the host system.
"""
@@ -108,7 +108,10 @@ class BinarySyncer(object):
# Ensure correct symlinks created:
self._sync_symlink('kubectl', 'openshift')
- self._sync_symlink('oadm', 'openshift')
+
+ # Remove old oadm binary
+ if os.path.exists(os.path.join(self.bin_dir, 'oadm')):
+ os.remove(os.path.join(self.bin_dir, 'oadm'))
def _sync_symlink(self, binary_name, link_to):
""" Ensure the given binary name exists and links to the expected binary. """