From e6d27759cb79af9fb2ec6d3c6619c7ddafd419c3 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 23 Mar 2023 11:44:23 +0100 Subject: [PATCH 1/2] release: Adapt kata-deploy for 3.1.0 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 851e958a4c..c273f8bea6 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:latest + image: quay.io/kata-containers/kata-deploy:3.1.0 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 a03a56b84e..e1a1d49ebf 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:latest + image: quay.io/kata-containers/kata-deploy:3.1.0 imagePullPolicy: Always lifecycle: preStop: From ac6c1d1f451f65f51f9a602047c822fc3083c78f Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 23 Mar 2023 11:44:23 +0100 Subject: [PATCH 2/2] release: Kata Containers 3.1.0 - Backports for 3.1 - dependency: update cgroups-rs e6d27759cb79 release: Adapt kata-deploy for 3.1.0 3eb7387bb741 agent: always use cgroupfs when running as init be512e7f346a agent: determine value of use_systemd_cgroup before LinuxContainer::new() 12ec33d70de7 rustjail: print type of cgroup manager 491b95451c6f workflows: Do not install docker 624dc2d22222 runtime: use filepath.Clean() to clean the mount path fcab7c3a01b4 osbuilder: Include minimal set of device nodes in ubuntu initrd 697707493084 kata-deploy: Fix static shim-v2 build on arm64 592ecdb67147 packaging/shim-v2: Install the target depending on the arch/libc d1305ee9eb5d runtime-rs: Add a generic powerpc64le-options.mk 59a05c7401ee kata-deploy: Fix kata static firecracker arm64 package build error 79a40d48953b dependency: update cgroups-rs Signed-off-by: Greg Kurz --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a36373c3bf..fd2a01863f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-rc0 +3.1.0