Bump to Kata Containers 3.22

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
tests: Remove steps that retry with containerd
2025-11-04 17:40:05 +01:00 · 2025-11-04 17:40:04 +01:00 · 2025-11-04 17:40:02 +01:00 · 2025-09-30 17:12:43 +02:00 · 2025-09-26 10:01:52 +02:00 · 2025-09-11 16:13:32 +02:00
4 changed files with 10 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
@ -73,5 +73,3 @@
 /kata-containers-3.21.0-vendor.tar.gz
 /kata-containers-3.22.0.tar.gz
 /kata-containers-3.22.0-vendor.tar.gz
-/kata-containers-3.23.0.tar.gz
-/kata-containers-3.23.0-vendor.tar.gz
--- a/1001-Remove-warnings-as-compilation-errors.patch
+++ b/1001-Remove-warnings-as-compilation-errors.patch
@ -18,18 +18,18 @@ Signed-off-by: Emanuel Lima <emlima@redhat.com>
 10 files changed, 18 insertions(+), 18 deletions(-)

 diff --git a/src/agent/Makefile b/src/agent/Makefile
+index e62a894aa..39d351213 100644
 --- a/src/agent/Makefile
 +++ b/src/agent/Makefile
-@@ -120,7 +120,7 @@ static-checks-build: $(GENERATED_CODE)
+@@ -130,14 +130,14 @@ static-checks-build: $(GENERATED_CODE)
 $(TARGET): $(GENERATED_CODE) $(TARGET_PATH)

 $(TARGET_PATH): show-summary
 -	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES)
 +	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES)

- $(GENERATED_FILES): %: %.in $(VERSION_FILE)
+ $(GENERATED_FILES): %: %.in
 	@sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@"
-@@ -127,7 +127,7 @@ $(GENERATED_FILES): %: %.in $(VERSION_FILE)

 ##TARGET optimize: optimized  build
 optimize: show-summary show-header
@ -38,7 +38,6 @@ diff --git a/src/agent/Makefile b/src/agent/Makefile

 ##TARGET install: install agent
 install: install-services
-
 diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile
 index 40bb7f915..5eb2c1016 100644
 --- a/src/dragonball/Makefile
@ -67,9 +66,10 @@ index aabaa3391..1fb6b20c3 100644
 format:
 	@echo "INFO: cargo fmt..."
 diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile
+index 0bb0617ff..188040864 100644
 --- a/src/runtime-rs/Makefile
 +++ b/src/runtime-rs/Makefile
-@@ -658,7 +658,7 @@ static-checks-build: $(GENERATED_FILES)
+@@ -600,7 +600,7 @@ static-checks-build: $(GENERATED_FILES)
 $(TARGET): $(GENERATED_FILES) $(TARGET_PATH)

 $(TARGET_PATH): $(SOURCES) | show-summary
@ -78,7 +78,7 @@ diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile

 $(GENERATED_FILES): %: %.in
 	@sed \
-@@ -668,7 +668,7 @@ $(GENERATED_FILES): %: %.in
+@@ -610,7 +610,7 @@ $(GENERATED_FILES): %: %.in

 ##TARGET optimize: optimized  build
 optimize: $(SOURCES) | show-summary show-header
--- a/kata-containers.spec
+++ b/kata-containers.spec
@ -28,7 +28,7 @@
 %endif

 # https://github.com/kata-containers/kata-containers
-Version: 3.23.0
+Version: 3.22.0
 %global tag         %{version}%{?rcstr}

 %global domain      github.com
@ -390,15 +390,9 @@ fi


 %changelog
-* Mon Nov 03 2025 Christophe de Dinechin <dinechin@redhat.com> - 3.22.0-1
+* Tue Nov 04 2025 Christophe de Dinechin <dinechin@redhat.com> - 3.22.0-1
 - kata-containers 3.22.0

-* Sun Oct 12 2025 Maxwell G <maxwell@gtmx.me> - 3.21.0-1.2
- Rebuild for golang 1.25.2
-
-* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 3.21.0-1.1
- rebuild
-
 * Thu Sep 25 2025 Christophe de Dinechin <dinechin@redhat.com> - 3.21.0-1
 - kata-containers 3.21.0

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (kata-containers-3.23.0.tar.gz) = d921dace40545fab47647c68357d88bf2807b74d5b3546ed0d91416b98fbad4ecaabf449abcc20e34cee8fbcacffe4a66a6012b63815e6b2c60c0319f982cc6e
-SHA512 (kata-containers-3.23.0-vendor.tar.gz) = 484c2dececc31a4fa9d4662f0a0051d52a916728e673396fbb70ab8ef02eb3ac225b815a03e2799aa7bcfe6478dd3ad785c628879914b0b113123f3952795c7b
+SHA512 (kata-containers-3.22.0.tar.gz) = 142bc70b6455f545d534371a845980ed00985d7225b5f672f3fef046a6f0a31871bd69ee2c931ab94c10089086123fe5987ec6615d7a7308027531269c4dae48
+SHA512 (kata-containers-3.22.0-vendor.tar.gz) = 10b28d746d5176acce4abcb902213edcfb43b0b390a5d20f114b7dc4e11bc8de26098f180bdf75bcff3e6d03f2b3a31908f4386d7ca24119f9e001cd99c52060
Author	SHA1	Message	Date
Christophe de Dinechin	3007f6d76a	Bump to Kata Containers 3.22 Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-11-04 17:40:05 +01:00
Christophe de Dinechin	1554ec9f19	tests: Remove steps that retry with containerd The CRIO test is specifically designed to test CRIO, so avoid falling back to containerd if things don't work with CRIO. Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-11-04 17:40:04 +01:00
Christophe de Dinechin	a4f777323d	Check that we are indeed running in a VM When running in kata containers, we should be running in a VM. One manifestation is that the boot command line is different. Check that and report it. Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-11-04 17:40:02 +01:00
Christophe de Dinechin	4825d12607	Add tests for CRIO and make test for containerd more explicit Add an rpm test that specifically uses crio, and make the containerd test more specifically mention containerd both in the name and in the description of the test. Also, the tests now first erase any old kata-containers package so that make sure we test a "from scratch" installation. Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-09-30 17:12:43 +02:00
Christophe de Dinechin	7a18990798	Bump to Kata 3.21.0 This matches Kata release 3.21.0 https://github.com/kata-containers/kata-containers/releases/tag/3.21.0 Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-09-26 10:01:52 +02:00
Maxwell G	193bb57c48	Bump to Kata Containers 3.20 Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-09-11 16:13:32 +02:00
Christophe de Dinechin	4fbec6a1b1	Bump to Kata 3.19.1 Latest release - Skipping short-lived 3.19.0 Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-29 16:03:24 +02:00
Christophe de Dinechin	fea541b04c	Bump to Kata Container 3.18 Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-28 15:48:21 +02:00
Christophe de Dinechin	40ae631a05	Bump to Kata Containers 3.17.0 Version bump, also rename test_kata_rpm.sh to test-kata-rpm.sh Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-28 10:52:59 +02:00
Christophe de Dinechin	089ad7138b	Revert "Changes to use the reduced `fedora` vendor tarball" In the Fedora case, we need to build tools like `kata-ctl`, so we need the corresponding vendoring code. Without it, the build fails with messages like: Updating git repository `https://github.com/firecracker-microvm/micro-http` error: failed to get `micro_http` as a dependency of package `kata-ctl v0.0.1 (/builddir/build/BUILD/kata-containers-3.16.0-build/kata-containers-3.16.0/src/tools/kata-ctl)`	2025-07-25 15:47:57 +02:00
Christophe de Dinechin	0c25278ed0	Changes to use the reduced `fedora` vendor tarball The procedure to reduce the vendor tarball means that the name of the sources changes. Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-25 15:47:54 +02:00
Christophe de Dinechin	24c59b1b11	Bump to Kata Containers 3.16 Some changes required to the 1001 patch file for src/genpolicy/Makefile Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-25 13:19:52 +02:00
Christophe de Dinechin	ee618ed4d3	Bump to Kata 3.15 Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-24 14:56:42 +02:00
Christophe de Dinechin	dd04afe195	Pick up the correct systemd unit when starting the OS With the current configuration, we get: [ 1.209181] systemd[1]: Failed to isolate default target: Unit rescue.service not found. [!!!!!!] Failed to isolate default target. [ 1.210339] systemd[1]: Freezing execution. Also added a very basic script, test_kata_rpm.sh, to check using `ctr` that we can run a basic Alpine container with the installed runtime. Signed-off-by: Christophe de Dinechin <dinechin@redhat.com> Suggested-by: Greg Kurz <gkurz@redhat.com>	2025-07-24 09:45:05 +02:00
Christophe de Dinechin	3cf47eaa99	Bump to Kata Containers 3.14 Adjusted patch 1001-Remove-warnings-as-compilation-errors.patch Removed patches 1000, 1002 and 1003, no longer needed Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-09 16:04:33 +02:00
Christophe de Dinechin	a9cf8b9efa	Bump to Kata Containers 3.13 The upstream vendor tarball contains an outdated version of the Rust `time` crate, which causes problems with recent Rust compiler versions. This was addressed earlier by patching the `Cargo.lock` to require a more recent version of the `time` crate, but that itself caused some dependencies to not be found in the upstream vendor tarball. In order to address the issue, both `kata-agent` and `kata-ctl` had to be revendored to pick up time version 0.3.37. As a result, the `kata-containers-3.13.0-vendor.tar.gz` that was added to sources does not match the upstream source. If you need to reconstruct the vendor tarball, the required steps are documented in the `vendor-tarball.sh` script. Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>	2025-07-07 18:15:03 +02:00