Fixing kubectl conflict on KUD addons

Removing kubectl (andrewrothstein.kubectl) dependency
that conflicts with kubectl installed by Kupespray.

Copy kubectl installed by Kubespray also to host
running Ansible.
That needs kubectl_localhost: true in Kubespray configuration
to make it copy binary to localhost.

Issue-ID: MULTICLOUD-667

Change-Id: I8c5f56488a9f559c4358cea5ad56fa23b26ec6aa
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>

diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index c37d274..1d84646 100755 (executable)
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -131,6 +131,8 @@ function install_k8s {
     # Configure environment
     mkdir -p $HOME/.kube
     cp $kud_inventory_folder/artifacts/admin.conf $HOME/.kube/config
+    # Copy Kubespray kubectl to be usable in host running Ansible. Requires kubectl_localhost: true in inventory/group_vars/k8s-cluster.yml
+    sudo cp $kud_inventory_folder/artifacts/kubectl /usr/local/bin/
 }
 
 # install_addons() - Install Kubenertes AddOns

diff --git a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
index 8f719a4..9966ba8 100644 (file)
--- a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
+++ b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
@@ -38,8 +38,10 @@ kube_token_auth: true
 # Can also be set to 'cloud', which lets the cloud provider setup appropriate routing
 kube_network_plugin: flannel
 
-# Make a copy of kubeconfig on the host that runs Ansible in GITDIR/artifacts
+# Make a copy of kubeconfig (admin.conf) on the host that runs Ansible to inventory/artifacts
 kubeconfig_localhost: true
+# Copy kubectl binary on the host that runs Ansible to inventory/artifacts
+kubectl_localhost: true
 
 # Enable MountPropagation gate feature
 local_volumes_enabled: true