Merge pull request #7284 from mook-as/bats/k3s-version-minimum-1.21

BATS: Fix failures due to minimum version of 1.21

bats/tests/k8s/specify-invalid-k8s-version.bats

@@ -17,7 +17,7 @@ load '../helpers/load'
     # No way there's a race-condition here.
     # The version was checked and written to the log file before starting k8s,
     # and we have to wait a few minutes before k8s is ready and we're at the next line.
-    assert_file_contains "$PATH_LOGS/kube.log" "Requested kubernetes version 'moose' is not a valid version. Falling back to the most recent stable version of"
+    assert_file_contains "$PATH_LOGS/kube.log" "Requested kubernetes version 'moose' is not a supported version. Falling back to"
 }
 
 # on macOS it still hangs without this

bats/tests/k8s/up-downgrade-k8s.bats

@@ -1,7 +1,6 @@
 # Test cases 8, 13, 19
 
 load '../helpers/load'
-ARCH_FOR_KUBERLR=amd64
 
 local_setup_file() {
     if semver_eq "$RD_KUBERNETES_VERSION" "$RD_KUBERNETES_ALT_VERSION"; then
@@ -19,6 +18,11 @@ local_setup_file() {
         export RD_KUBERNETES_VERSION_LOW=$RD_KUBERNETES_VERSION
         export RD_KUBERNETES_VERSION_HIGH=$RD_KUBERNETES_ALT_VERSION
     fi
+    case "$(uname -m)" in
+    amd64 | x86_64 | i*86) export ARCH_FOR_KUBERLR=amd64 ;;
+    arm*) export ARCH_FOR_KUBERLR=arm64 ;;
+    *) printf "Unsupported architecture %s\n" "$(uname -m)" | fail ;;
+    esac
 }
 
 @test 'factory reset' {

bats/tests/profile/deployment.bats

@@ -194,7 +194,7 @@ api_set() {
     assert_failure
     assert_output --partial 'field "application.extensions.allowed.list" is locked'
 
-    run api_set '"kubernetes": {"version": "1.16.15"}'
+    run api_set '"kubernetes": {"version": "'"$KUBERNETES_RANDOM_VERSION"'"}'
     assert_failure
     assert_output --partial 'field "kubernetes.version" is locked'
 }