From 0b94550c42730121c3d270758286dbefa95ea61c Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Wed, 13 Dec 2023 18:52:15 +0530 Subject: [PATCH] chore: fix the gvisor test The gvisor test was not using the correct runtimeclass and would have always passed the regardless. Signed-off-by: Noel Georgi --- Makefile | 2 +- internal/integration/api/extensions_qemu.go | 1 + pkg/machinery/constants/constants.go | 2 +- pkg/machinery/gendata/data/pkgs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index db4fed6c1..526c63060 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ CLOUD_IMAGES_EXTRA_ARGS ?= "" ARTIFACTS := _out TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-alpha.0 -PKGS ?= v1.7.0-alpha.0-2-ga36dec4 +PKGS ?= v1.7.0-alpha.0-7-g4c59641 PKG_KERNEL ?= ghcr.io/siderolabs/kernel:$(PKGS) EXTRAS ?= v1.7.0-alpha.0 # renovate: datasource=github-tags depName=golang/go diff --git a/internal/integration/api/extensions_qemu.go b/internal/integration/api/extensions_qemu.go index 36d7875b1..b23ff810e 100644 --- a/internal/integration/api/extensions_qemu.go +++ b/internal/integration/api/extensions_qemu.go @@ -379,6 +379,7 @@ func (suite *ExtensionsSuiteQEMU) TestExtensionsGvisor() { Name: "nginx-gvisor", }, Spec: corev1.PodSpec{ + RuntimeClassName: pointer.To("gvisor"), Containers: []corev1.Container{ { Name: "nginx-gvisor", diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 150ce39b4..9643627d8 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -479,7 +479,7 @@ const ( TrustdUserID = 51 // DefaultContainerdVersion is the default container runtime version. - DefaultContainerdVersion = "1.7.10" + DefaultContainerdVersion = "1.7.11" // SystemContainerdNamespace is the Containerd namespace for Talos services. SystemContainerdNamespace = "system" diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index 658a2b15d..17c0816be 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.7.0-alpha.0-2-ga36dec4 \ No newline at end of file +v1.7.0-alpha.0-7-g4c59641 \ No newline at end of file