From 238f67005f76eda2763240b333348b6df1ceb7a2 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Fri, 18 Oct 2024 12:29:17 +0200 Subject: [PATCH] tests: Add `kubeadm` option for KUBERNETES in gha-run.sh When creating a k8s cluster via kubeadm, the devmapper setup for containerd requires a different configuration. This commit introduces a new `kubeadm` option for the KUBERNETES variable and adjusts the path to the containerd config file for devmapper setup. Signed-off-by: Hyounggyu Choi --- tests/integration/kubernetes/gha-run.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 7934ab958c..62faae2cab 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -80,21 +80,37 @@ EOF containerd_config_file="/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl" sudo cp /var/lib/rancher/k3s/agent/etc/containerd/config.toml "${containerd_config_file}" ;; + kubeadm) + containerd_config_file="/etc/containerd/config.toml" + ;; *) >&2 echo "${KUBERNETES} flavour is not supported"; exit 2 ;; esac # We're not using this with baremetal machines, so we're fine on cutting # corners here and just append this to the configuration file. - cat<&2 echo "${KUBERNETES} flavour is not supported"; exit 2 ;; esac