From 988ebcf24c7d854a4053437b69cfb120acb8039c Mon Sep 17 00:00:00 2001 From: Todd Malsbary 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 Change-Id: Ic8b9fb1f3effc31da58de5bb3768ed9e509d50de --- kud/tests/plugin_fw.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'kud/tests/plugin_fw.sh') diff --git a/kud/tests/plugin_fw.sh b/kud/tests/plugin_fw.sh index 4d59006b..0a0f62dc 100755 --- a/kud/tests/plugin_fw.sh +++ b/kud/tests/plugin_fw.sh @@ -23,10 +23,8 @@ source _common.sh if [ ${1:+1} ]; then if [ "$1" == "--external" ]; then - master_ip=$(kubectl cluster-info | grep "Kubernetes master" | \ - awk -F ":" '{print $2}' | awk -F "//" '{print $2}') onap_svc_node_port=30498 - base_url="http://$master_ip:$onap_svc_node_port/v1" + base_url="http://$(control_plane_ip):$onap_svc_node_port/v1" fi fi -- cgit 1.2.3-korg