From 988ebcf24c7d854a4053437b69cfb120acb8039c Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Wed, 11 Nov 2020 12:13:03 -0800
Subject: Allow KuD installer to specify Kubespray 2.14.1 or 2.16.0

The default is 2.14.1 (the existing value).  Setting
KUBESPRAY_VERSION=2.16.0 in the installer environment uses the newer
Kubespray version.

The newer Kubespray version installs Kubernetes 1.20.7.  Kubernetes
1.20.7 comes with following caveats:
- The Virtlet addon is disabled; it does not work with 1.20.7.  This
  requires removing the plugin_fw test as well.
- Kubernetes 1.20.7 removed support for basic auth.

Issue-ID: MULTICLOUD-1251
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Ic8b9fb1f3effc31da58de5bb3768ed9e509d50de
---
 kud/tests/plugin_fw_v2.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'kud/tests/plugin_fw_v2.sh')

diff --git a/kud/tests/plugin_fw_v2.sh b/kud/tests/plugin_fw_v2.sh
index abab9004..86ef97f9 100755
--- a/kud/tests/plugin_fw_v2.sh
+++ b/kud/tests/plugin_fw_v2.sh
@@ -56,8 +56,7 @@ while [[ $# -gt 0 ]]; do
 
     case $arg in
         "--external" )
-            service_host=$(kubectl cluster-info | grep "Kubernetes master" | \
-                awk -F ":" '{print $2}' | awk -F "//" '{print $2}')
+            service_host=$(control_plane_ip)
             shift
             ;;
         * )
-- 
cgit 1.2.3-korg