From 4ec5db0fb36a0abc64cae19755ac5a812f660b28 Mon Sep 17 00:00:00 2001 From: Peteris Rudzusiks Date: Mon, 15 May 2023 16:59:36 +0200 Subject: [PATCH 1/4] runtime: use enable_vcpus_pinning from toml Set the default value of runtime's EnableVCPUsPinning to value read from .toml. Fixes: #6836 Signed-off-by: Peteris Rudzusiks --- src/runtime/pkg/oci/utils.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/runtime/pkg/oci/utils.go b/src/runtime/pkg/oci/utils.go index d2d713ff8..ff5c1912b 100644 --- a/src/runtime/pkg/oci/utils.go +++ b/src/runtime/pkg/oci/utils.go @@ -963,6 +963,8 @@ func SandboxConfig(ocispec specs.Spec, runtime RuntimeConfig, bundlePath, cid st DisableGuestSeccomp: runtime.DisableGuestSeccomp, + EnableVCPUsPinning: runtime.EnableVCPUsPinning, + GuestSeLinuxLabel: runtime.GuestSeLinuxLabel, Experimental: runtime.Experimental, From d37c6e370d817f66a49596ee64ac5a51b41c2c35 Mon Sep 17 00:00:00 2001 From: Peteris Rudzusiks Date: Mon, 15 May 2023 16:03:33 +0200 Subject: [PATCH 2/4] resource-control: fix setting CPU affinities on Linux With this fix the vCPU pinning feature chooses the correct physical cores to pin the vCPU threads on rather than always using core 0. Fixes #6831 Signed-off-by: Peteris Rudzusiks --- src/runtime/pkg/resourcecontrol/utils_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/pkg/resourcecontrol/utils_linux.go b/src/runtime/pkg/resourcecontrol/utils_linux.go index 59ca788f8..0acbc6c6a 100644 --- a/src/runtime/pkg/resourcecontrol/utils_linux.go +++ b/src/runtime/pkg/resourcecontrol/utils_linux.go @@ -156,7 +156,7 @@ func IsCgroupV1() (bool, error) { func SetThreadAffinity(threadID int, cpuSetSlice []int) error { unixCPUSet := unix.CPUSet{} - for cpuId := range cpuSetSlice { + for _, cpuId := range cpuSetSlice { unixCPUSet.Set(cpuId) } From 69457dc4c7c2ca6630d1587cc74a793949eaeca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 19 May 2023 09:32:44 +0200 Subject: [PATCH 3/4] release: Adapt kata-deploy for 3.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kata-deploy files must be adapted to a new release. The cases where it happens are when the release goes from -> to: * main -> stable: * kata-deploy-stable / kata-cleanup-stable: are removed * stable -> stable: * kata-deploy / kata-cleanup: bump the release to the new one. There are no changes when doing an alpha release, as the files on the "main" branch always point to the "latest" and "stable" tags. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml | 2 +- tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml index 8456f8844..f751304cc 100644 --- a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml +++ b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml @@ -18,7 +18,7 @@ spec: katacontainers.io/kata-runtime: cleanup containers: - name: kube-kata-cleanup - image: quay.io/kata-containers/kata-deploy:3.1.1 + image: quay.io/kata-containers/kata-deploy:3.1.2 imagePullPolicy: Always command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset" ] env: diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml index 1d6a5a36b..1b89921e2 100644 --- a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: kata-label-node containers: - name: kube-kata - image: quay.io/kata-containers/kata-deploy:3.1.1 + image: quay.io/kata-containers/kata-deploy:3.1.2 imagePullPolicy: Always lifecycle: preStop: From d67afa969a10da1c960b3117d971f307dc0a9c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 19 May 2023 09:32:44 +0200 Subject: [PATCH 4/4] release: Kata Containers 3.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - stable-3.1 | update tokio dependency 731823c17 release: Adapt kata-deploy for 3.1.2 b9ac2a118 runtime-rs: update tokio dependency 8639f1b42 runk: update tokio dependency 6e5a7aaff agent: update tokio dependency Signed-off-by: Fabiano Fidêncio --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 94ff29cc4..ef538c281 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.1 +3.1.2