diff options
| author |   Todd Malsbary <todd.malsbary@intel.com> | 2020-11-11 12:13:03 -0800 |
|---|---|---|
| committer | Todd Malsbary <todd.malsbary@intel.com> | 2021-10-12 10:57:04 -0700 |
| commit | 988ebcf24c7d854a4053437b69cfb120acb8039c (patch) | |
| tree | 6504bc0acaab449f44dc3d71a182984c2469b43b /kud/tests/emco.sh | |
| parent | 5aa8c4de9fd620ef42ac5bf73b62f76d80e713a0 (diff) | |
Allow KuD installer to specify Kubespray 2.14.1 or 2.16.00.9.2
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
Diffstat (limited to 'kud/tests/emco.sh')
| -rwxr-xr-x | kud/tests/emco.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kud/tests/emco.sh b/kud/tests/emco.sh index 1e003968..109f5638 100755 --- a/kud/tests/emco.sh +++ b/kud/tests/emco.sh @@ -17,8 +17,7 @@ function delete_resource_nox { ! call_api -X GET "$1" >/dev/null } -master_ip=$(kubectl cluster-info | grep "Kubernetes master" | \ - awk -F ":" '{print $2}' | awk -F "//" '{print $2}') +master_ip=$(control_plane_ip) rsync_service_port=30441 rsync_service_host="$master_ip" base_url_orchestrator=${base_url_orchestrator:-"http://$master_ip:30415/v2"} |