Skip to content

Conversation

BbolroC
Copy link
Member

@BbolroC BbolroC commented Aug 19, 2025

While running the initdata test with runtime-rs, the following issues were identified:

  • An empty string for the initdata annotation is not properly handled
  • The assertion string "\[CDH\] \[ERROR\]: Get Resource failed" does not appear for runtime-rs
  • cc_init_data should have been put in enable_annotations in the configuration file
  • io.katacontainers.config.hypervisor.cc_init_data should have been used

This PR resolves the issues.

This will unblock a CI issue for #11447.

For details, please have a look at each commit message.

Signed-off-by: Alex Lyn alex.lyn@antgroup.com
Signed-off-by: Hyounggyu Choi Hyounggyu.Choi@ibm.com

FYI: @stevenhorsman @Apokleos

Copy link
Contributor

@Apokleos Apokleos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx @BbolroC LGTM. Let's move it forward.

@BbolroC BbolroC added the do-not-merge PR has problems or depends on another label Aug 19, 2025
@BbolroC
Copy link
Member Author

BbolroC commented Aug 19, 2025

Hold on! We need to consider

cc_initdata_annotation_key="io.katacontainers.config.runtime.cc_init_data"
to go the test green for both go-runtime and runtime-rs.

@BbolroC BbolroC force-pushed the revert-initdata-annotation branch from 3634162 to 5c1cdca Compare August 19, 2025 10:35
@BbolroC BbolroC changed the title runtime-rs: Revert initdata annotation runtime-rs: Rename initdata annotation from runtime to hypervisor Aug 19, 2025
@BbolroC BbolroC marked this pull request as draft August 19, 2025 11:17
@BbolroC BbolroC force-pushed the revert-initdata-annotation branch from 5c1cdca to 114435c Compare August 19, 2025 11:25
@BbolroC BbolroC changed the title runtime-rs: Rename initdata annotation from runtime to hypervisor runtime-rs: Fix issues for initdata Aug 19, 2025
@BbolroC
Copy link
Member Author

BbolroC commented Aug 19, 2025

I’ve renamed the title so we can track all initdata issues and continue the discussion here. I’d like to reach out to @burgerdev, @fitzthum, and @Xynnn007 for feedback on renaming the annotation. I will keep this as draft until we reach an agreement.

… definition"

This reverts commit ede773d.

`cc_init_data` should be under a hypervisor category because
it is a hypervisor-specific feature. The annotation including
`runtime` also breaks a logic for `is_annotation_enabled()`.

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This reverts commit 37685c4.

This renames the relevant constant for initdata.

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
@BbolroC BbolroC force-pushed the revert-initdata-annotation branch from 1c8bedf to 0daafec Compare August 20, 2025 08:15
Copy link
Contributor

@burgerdev burgerdev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

Annotation change acknowledged - makes sense!

@Apokleos Apokleos merged commit 014ab2f into kata-containers:main Aug 20, 2025
661 of 720 checks passed
stevenhorsman added a commit to stevenhorsman/cloud-api-adaptor that referenced this pull request Aug 20, 2025
In kata-containers/kata-containers#11693
the initdata annotation changed, so update our code to reflect this

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
@BbolroC BbolroC deleted the revert-initdata-annotation branch August 20, 2025 17:03
stevenhorsman added a commit to stevenhorsman/cloud-api-adaptor that referenced this pull request Aug 21, 2025
In kata-containers/kata-containers#11693
the initdata annotation changed, so update our code to reflect this

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
stevenhorsman added a commit to stevenhorsman/kata-containers that referenced this pull request Aug 21, 2025
In kata-containers#11693 the cc_init_data annotation was changes to be hypervisor
scoped, so each hypervisor needs to explicitly allow it in order to
use it now, so add this to both the go and rust runtime's remote
configurations

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants