From f2319d693d95fbd716c7e92f52dde124c5ba90dc Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Fri, 1 Apr 2022 06:20:20 +0000 Subject: [PATCH 1/2] release: Adapt kata-deploy for 2.4.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: Peng Tao --- 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..80ff9b2c6e 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:2.4.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..13fc04e4b0 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:2.4.0 imagePullPolicy: Always lifecycle: preStop: From 4c9c01a124d8bb5938aa9be0975061476fc3ccbd Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Fri, 1 Apr 2022 06:20:20 +0000 Subject: [PATCH 2/2] release: Kata Containers 2.4.0 - stable-2.4 | agent: fix container stop error with signal SIGRTMIN+3 - stable-2.4 | kata-monitor: fix duplicated output when printing usage - stable-2.4 | runtime: Stop getting OOM events from agent for "ttrpc closed" error - kata-deploy: fix version bump from -rc to stable - stable-2.4: release: Include all the rust vendored code into the vendored tarball - stable-2.4 | tools: release: Do not consider release candidates as stable releases - agent: Signal the whole process group - stable-2.4 | docs: Update k8s documentation - backport main commits to stable 2.4 - stable-2.4: Bump QEMU to 6.2 (bringing then SGX support in) - runtime: Properly handle ESRCH error when signaling container - stable-2.4 | versions: Upgrade to Cloud Hypervisor v22.1 f2319d69 release: Adapt kata-deploy for 2.4.0 cae48e9c agent: fix container stop error with signal SIGRTMIN+3 342aa95c kata-monitor: fix duplicated output when printing usage 9f75e226 runtime: add logs around sandbox monitor 363fbed8 runtime: stop getting OOM events when ttrpc: closed error f840de5a workflows,release: Ship *all* the rust vendored code 952cea5f tools: Add a generate_vendor.sh script cc965fa0 kata-deploy: fix version bump from -rc to stable f41cc184 tools: release: Do not consider release candidates as stable releases e059b50f runtime: Add more debug logs for container io stream copy 71ce6f53 agent: Kill the all the container processes of the same cgroup 30fc2c86 docs: Update k8s documentation 24028969 virtcontainers: Run mock hook from build tree rather than system bin dir 4e54aa5a doc: fix filename typo d815393c manager: Add options to change self test behaviour 4111e1a3 manager: Add option to enable component debug 2918be18 manager: Create containerd link 6b31b068 kernel: fix cve-2022-0847 5589b246 doc: update Intel SGX use cases document 1da88dca tools: update QEMU to 6.2 3e2f9223 runtime: Properly handle ESRCH error when signaling container 4c21cb3e versions: Upgrade to Cloud Hypervisor v22.1 Signed-off-by: Peng Tao --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cbc70e35ba..197c4d5c2d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.0-rc0 +2.4.0