From 309756db95abbc45c6c3a6fd44af6926f0992b56 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 29 Sep 2022 18:10:07 +0200 Subject: [PATCH 1/2] release: Adapt kata-deploy for 2.5.2 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: Greg Kurz --- 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 69f042bef3..1caa2a82e3 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:2.5.1 + image: quay.io/kata-containers/kata-deploy:2.5.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 d629d1d676..41a12883fe 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:2.5.1 + image: quay.io/kata-containers/kata-deploy:2.5.2 imagePullPolicy: Always lifecycle: preStop: From 5c69eb5be691f6b4bee1fbd963f2880bc627df54 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 29 Sep 2022 18:10:07 +0200 Subject: [PATCH 2/2] release: Kata Containers 2.5.2 - tools: release: fix bogus version check - Last backport for 2.5.2 - stable-2.5: fix cargo vendor - stable-2.5 backports 309756db95ab release: Adapt kata-deploy for 2.5.2 a8187717506b tools: release: fix bogus version check 52993b91b7e3 runtime: store the user name in hypervisor config 30a8166f4ae2 runtime: make StopVM thread-safe 7033c97cd284 runtime: add more debug logs for non-root user operation e8ec0c402fa0 stable-2.5: fix cargo vendor d92ada72deb6 kernel: upgrade guest kernel support to 5.19.2 565fdf8263db kernel: fix for set_kmem_limit error f174fac0d670 sandbox_test: Add test to verify memory hotplug behavior 928654b5cd2f sandbox: don't hotplug too much memory at once 1c0e6b4356e8 hypervisor: Add GetTotalMemoryMB to interface 8f40927df8e7 kernel: Add CONFIG_CGROUP_HUGETLB=y as part of the cgroup fragments Signed-off-by: Greg Kurz --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 73462a5a13..f225a78adf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.1 +2.5.2