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

feat: Package directory volumes when using OCI #676

Draft
wants to merge 6 commits into
base: staging
Choose a base branch
from

Conversation

craciunoiuc
Copy link
Member

Prerequisite checklist

  • Read the contribution guidelines regarding submitting new changes to the project;
  • Tested your changes against relevant architectures and platforms;
  • Ran make fmt on your commit series before opening this PR;
  • Updated relevant documentation.

Description of changes

Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Output string `local:"true" long:"output" short:"o" usage:"Save the package at the following output"`
Platform string `local:"true" long:"plat" short:"p" usage:"Filter the creation of the package by platform of known targets"`
Target string `local:"true" long:"target" short:"t" usage:"Package a particular known target"`
Volume []string `local:"true" long:"volume" short:"v" usage:"Path to volume to bundle within the package (passing a path will automatically generate a CPIO image)"`
Copy link
Member

Choose a reason for hiding this comment

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

Based on the implementation, there is no CPIO generation so the usage should be updated.

Comment on lines +20 to +21
AnnotationKernelVolumePath = "org.unikraft.kernel.volume-%d.path"
AnnotationKernelVolumeMount = "org.unikraft.kernel.volume-%d.mount"
Copy link
Member

@nderjung nderjung Jul 25, 2023

Choose a reason for hiding this comment

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

To be consistent with Unikraft's core:

- org.unikraft.kernel.volume-%d.path"
+ org.unikraft.volume.fs%d.path"
- org.unikraft.kernel.volume-%d.mount"
+ org.unikraft.volume.fs%d.mount"

Copy link
Member

Choose a reason for hiding this comment

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

Let's also add the type here:

org.unikraft.volume.fs%d.type

Copy link
Member

@nderjung nderjung Jul 25, 2023

Choose a reason for hiding this comment

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

I am thinking about the attributes that are coming from the new addition occuring in the core to handle volumes: unikraft/unikraft#979

@@ -17,6 +17,8 @@ const (
AnnotationKernelKConfig = "org.unikraft.kernel.kconfig."
AnnotationKernelArch = "org.unikraft.kernel.arch"
AnnotationKernelPlat = "org.unikraft.kernel.plat"
AnnotationKernelVolumePath = "org.unikraft.kernel.volume-%d.path"
AnnotationKernelVolumeMount = "org.unikraft.kernel.volume-%d.mount"
AnnotationFilesystemPath = "org.unikraft.filesystem"
AnnotationDiskIndexPathPattern = "org.unikraft.disk-%d"
Copy link
Member

@nderjung nderjung Jul 25, 2023

Choose a reason for hiding this comment

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

I think this is what filesystem and disk- was meant to be. So these can be removed.

@craciunoiuc craciunoiuc added kind/enhancement New feature or request area/cmd Issue or PR related to all CLI programs area/archive Issue or PR is related to KraftKit archiving area/oci Issue or PR is related to OCI package management labels Jul 25, 2023
@craciunoiuc craciunoiuc marked this pull request as draft July 25, 2023 15:38
@craciunoiuc
Copy link
Member Author

@nderjung is this still needed? I feel like there was no real push to have volumes in packages.

Should I close this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/archive Issue or PR is related to KraftKit archiving area/cmd Issue or PR related to all CLI programs area/oci Issue or PR is related to OCI package management kind/enhancement New feature or request
Projects
Status: 🧊 Icebox
Development

Successfully merging this pull request may close these issues.

2 participants