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/negative_tests | |
| 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/negative_tests')
9 files changed, 9 insertions, 27 deletions
diff --git a/kud/tests/negative_tests/test_all_intents.sh b/kud/tests/negative_tests/test_all_intents.sh index 1f2f721f..00304906 100755 --- a/kud/tests/negative_tests/test_all_intents.sh +++ b/kud/tests/negative_tests/test_all_intents.sh @@ -26,10 +26,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_composite_app.sh b/kud/tests/negative_tests/test_composite_app.sh index 8656a1d8..d020b860 100755 --- a/kud/tests/negative_tests/test_composite_app.sh +++ b/kud/tests/negative_tests/test_composite_app.sh @@ -26,10 +26,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_controllers.sh b/kud/tests/negative_tests/test_controllers.sh index 20e6bda0..80e2f34f 100755 --- a/kud/tests/negative_tests/test_controllers.sh +++ b/kud/tests/negative_tests/test_controllers.sh @@ -25,10 +25,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_deployment_intent_group.sh b/kud/tests/negative_tests/test_deployment_intent_group.sh index 402a0b1d..18857e42 100755 --- a/kud/tests/negative_tests/test_deployment_intent_group.sh +++ b/kud/tests/negative_tests/test_deployment_intent_group.sh @@ -26,10 +26,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_generic_placement_intent.sh b/kud/tests/negative_tests/test_generic_placement_intent.sh index 708180f8..4d8834da 100755 --- a/kud/tests/negative_tests/test_generic_placement_intent.sh +++ b/kud/tests/negative_tests/test_generic_placement_intent.sh @@ -26,10 +26,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_generic_placement_intent_app.sh b/kud/tests/negative_tests/test_generic_placement_intent_app.sh index 23e7dd00..f0b7fbb8 100755 --- a/kud/tests/negative_tests/test_generic_placement_intent_app.sh +++ b/kud/tests/negative_tests/test_generic_placement_intent_app.sh @@ -26,10 +26,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_multipart.sh b/kud/tests/negative_tests/test_multipart.sh index 7f4a84be..ee15bf27 100755 --- a/kud/tests/negative_tests/test_multipart.sh +++ b/kud/tests/negative_tests/test_multipart.sh @@ -26,10 +26,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_profile.sh b/kud/tests/negative_tests/test_profile.sh index c5002d50..44cfee23 100755 --- a/kud/tests/negative_tests/test_profile.sh +++ b/kud/tests/negative_tests/test_profile.sh @@ -26,10 +26,8 @@ source _test_functions.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 diff --git a/kud/tests/negative_tests/test_profile_apps.sh b/kud/tests/negative_tests/test_profile_apps.sh index ca8c6454..6e6adbf8 100755 --- a/kud/tests/negative_tests/test_profile_apps.sh +++ b/kud/tests/negative_tests/test_profile_apps.sh @@ -26,10 +26,8 @@ source _test_functions.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 |