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

runtime-rs: Enhancement of DirectVolume when using a dedicated CSI #8620

Merged
merged 2 commits into from Dec 14, 2023

Conversation

Apokleos
Copy link
Contributor

(1) Enhancement of DirectVolume when using CSI.
We use a matching direct-volume path to determine whether an OCI mount
is a DirectVolume. However, we should handle the case where no match is
found appropriately.
This error will be defined as a non-DirectVolume type when judging the
OCI mount but not failed.

(2) Add attribe serde rename to each field of DirectVolume.
DirectVolume structure in runtime-rs is different from it in kata-runtime,
which causes they has no unified handling method for DirectVolumeMountInfo
and MountInfo.

We should align the two by simply adding the attribute #[serde(rename="x")
to each field in DirectVolumeMountInfo

Fixes: #8619

Signed-off-by: alex.lyn alex.lyn@antgroup.com

@katacontainersbot katacontainersbot added the size/small Small and simple task label Dec 10, 2023
@Apokleos Apokleos self-assigned this Dec 12, 2023
@Apokleos Apokleos added ok-to-test runtime-rs no-backport-needed size/large Task of significant size size/small Small and simple task and removed size/small Small and simple task size/large Task of significant size labels Dec 12, 2023
Copy link
Member

@Tim-Zhang Tim-Zhang 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 @Apokleos

Copy link
Contributor

@quanweiZhou quanweiZhou left a comment

Choose a reason for hiding this comment

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

Thanks @Apokleos, LGTM.

DirectVolume structure in runtime-rs is different from it in kata-runtime,
which causes they has no unified handling method for DirectVolumeMountInfo
and MountInfo.

We should align the two by simply adding the attribute #[serde(rename="x")
to each field in DirectVolumeMountInfo

Fixes: kata-containers#8619

Signed-off-by: alex.lyn <alex.lyn@antgroup.com>
We use a matching direct-volume path to determine whether an OCI mount
is a DirectVolume. However, we should handle the case where no match is
found appropriately.
This error will be defined as a non-DirectVolume type when judging the
OCI mount but not failed.

Fixes: kata-containers#8619

Signed-off-by: alex.lyn <alex.lyn@antgroup.com>
@Apokleos
Copy link
Contributor Author

/test

@Apokleos Apokleos merged commit c7c7632 into kata-containers:main Dec 14, 2023
173 of 178 checks passed
@Apokleos Apokleos deleted the enhance-directv-using-csi branch December 14, 2023 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

runtime-rs: enhancement of DirectVolume when using CSI
5 participants