Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests:k8s: make add_kernel_initrd_anotations function generic #9061

Merged
merged 1 commit into from Feb 9, 2024

Conversation

GabyCT
Copy link
Contributor

@GabyCT GabyCT commented Feb 8, 2024

This PR replaces the add_kernel_initrd_annotations_to_yaml function more generic so later can be used for other components.

Fixes #9054

Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

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

@GabyCT, I've left a few comments.

tests/integration/kubernetes/setup.sh Outdated Show resolved Hide resolved
tests/integration/kubernetes/setup.sh Outdated Show resolved Hide resolved
tests/integration/kubernetes/setup.sh Outdated Show resolved Hide resolved
tests/integration/kubernetes/setup.sh Outdated Show resolved Hide resolved
Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

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

A few more comments. :-)

tests/integration/kubernetes/setup.sh Outdated Show resolved Hide resolved
tests/integration/kubernetes/setup.sh Outdated Show resolved Hide resolved
This PR replaces the add_kernel_initrd_annotations_to_yaml function
more generic so later can be used for other components.

Fixes kata-containers#9054

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
@sprt sprt self-requested a review February 8, 2024 20:07
@GabyCT GabyCT changed the title WIP tests:k8s: make add_kernel_initrd_anotations function generic tests:k8s: make add_kernel_initrd_anotations function generic Feb 8, 2024
@GabyCT
Copy link
Contributor Author

GabyCT commented Feb 8, 2024

@fidencio changes applied

@GabyCT
Copy link
Contributor Author

GabyCT commented Feb 8, 2024

/test

Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

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

lgtm, @GabyCT, thanks!

And looking at the logs of the tests:

#                      io.katacontainers.config.hypervisor.initrd: /opt/kata/share/kata-containers/kata-containers-initrd-mariner.img
#                      io.katacontainers.config.hypervisor.kernel: /usr/share/cloud-hypervisor/vmlinux.bin

We can see that the annotations are still being passed correctly!

Copy link
Member

@stevenhorsman stevenhorsman 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 @GabyCT

@fidencio fidencio merged commit 03f7cfd into kata-containers:main Feb 9, 2024
334 of 340 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test size/small Small and simple task
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make add_kernel_initrd_annotations_to_yaml generic
4 participants