github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-12 14:48:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11529 from fidencio/topic/only-use-fixed-version-of-k0s-for-crio

Browse Source 
tests: k0s: Always use latest version, apart from CRI-O tests
This commit is contained in:
Fabiano Fidêncio 2025-07-09 18:47:18 +02:00 committed by GitHub
commit c68eb58f3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/run-k8s-tests-on-amd64.yaml vendored
View File

@ -79,6 +79,8 @@ jobs:
- name: Deploy ${{ matrix.k8s }} - name: Deploy ${{ matrix.k8s }}
run: bash tests/integration/kubernetes/gha-run.sh deploy-k8s run: bash tests/integration/kubernetes/gha-run.sh deploy-k8s
env:
CONTAINER_RUNTIME: ${{ matrix.container_runtime }}
- name: Configure the ${{ matrix.snapshotter }} snapshotter - name: Configure the ${{ matrix.snapshotter }} snapshotter
if: matrix.snapshotter != '' if: matrix.snapshotter != ''

2
tests/functional/kata-deploy/kata-deploy.bats
View File

@ -91,7 +91,7 @@ setup() {
teardown() { teardown() {
pushd "${repo_root_dir}" pushd "${repo_root_dir}"
helm uninstall --namespace=kube-system kata-deploy --wait helm uninstall --namespace=kube-system kata-deploy
kubectl -n kube-system wait --timeout=10m --for=delete -l name=kata-deploy pod kubectl -n kube-system wait --timeout=10m --for=delete -l name=kata-deploy pod
popd popd

19
tests/gha-run-k8s-common.sh
View File

@ -31,6 +31,7 @@ KATA_HOST_OS="${KATA_HOST_OS:-}"
KUBERNETES="${KUBERNETES:-}" KUBERNETES="${KUBERNETES:-}"
K8S_TEST_HOST_TYPE="${K8S_TEST_HOST_TYPE:-small}" K8S_TEST_HOST_TYPE="${K8S_TEST_HOST_TYPE:-small}"
TEST_CLUSTER_NAMESPACE="${TEST_CLUSTER_NAMESPACE:-}" TEST_CLUSTER_NAMESPACE="${TEST_CLUSTER_NAMESPACE:-}"
CONTAINER_RUNTIME="${CONTAINER_RUNTIME:-containerd}"
function _print_instance_type() { function _print_instance_type() {
case "${K8S_TEST_HOST_TYPE}" in case "${K8S_TEST_HOST_TYPE}" in
@ -192,16 +193,20 @@ function get_nodes_and_pods_info() {
} }
function deploy_k0s() { function deploy_k0s() {
url=$(get_from_kata_deps ".externals.k0s.url") if [[ "${CONTAINER_RUNTIME}" == "crio" ]]; then
url=$(get_from_kata_deps ".externals.k0s.url")
k0s_version_param="" k0s_version_param=""
version=$(get_from_kata_deps ".externals.k0s.version") version=$(get_from_kata_deps ".externals.k0s.version")
if [[ -n "${version}" ]]; then if [[ -n "${version}" ]]; then
k0s_version_param="K0S_VERSION=${version}" k0s_version_param="K0S_VERSION=${version}"
fi
curl -sSLf "${url}" | sudo "${k0s_version_param}" sh
else
curl -sSLf -sSLf https://get.k0s.sh | sudo sh
fi fi
curl -sSLf "${url}" | sudo "${k0s_version_param}" sh
# In this case we explicitly want word splitting when calling k0s # In this case we explicitly want word splitting when calling k0s
# with extra parameters. # with extra parameters.
# shellcheck disable=SC2086 # shellcheck disable=SC2086

2
versions.yaml
View File

@ -301,6 +301,8 @@ externals:
url: "https://github.com/lvmteam/lvm2" url: "https://github.com/lvmteam/lvm2"
version: "v2_03_16" version: "v2_03_16"
# This is only used for CRI-O.
# kata-deploy tests rely on the latest version of k0s.
k0s: k0s:
description: "K0s Kubernetes distribution, used in cri-o testing" description: "K0s Kubernetes distribution, used in cri-o testing"
url: "https://get.k0s.sh" url: "https://get.k0s.sh"