Skip to content

Temp PR for visual diff of VM templating change. DO NOT MERGE #456

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.

Sign up for GitHub

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

Draft
Camelron wants to merge 17 commits into
base: msft-preview-3.27.0
Choose a base branch
from
Draft

Temp PR for visual diff of VM templating change. DO NOT MERGE #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8c82154
Implement SaveVM and PauseVM fns. for CLH
May 4, 2026
5777b04
Implement VM Restore functionality for CLH
May 7, 2026
45ec1d9
Implement ResumeVM fn. for CLH
May 7, 2026
83fc837
Set the vmInfo state after mock Pause and Resume calls
May 7, 2026
c066393
Add test for SaveVM function
May 7, 2026
bc65ce6
Remove initrd image check for VM templating
May 4, 2026
4a0f124
Truncate VM Template's memory file
May 12, 2026
0417a3a
Set MemoryZone config for Template-related VMs
May 4, 2026
277f7e2
Set VMStorePath for the template VM
May 12, 2026
a03fb34
Make template deviceStatePath configurable
May 12, 2026
cbae2e6
Expand resetHypervisorConfig
May 12, 2026
486490c
Update CLH template VM config to set memory shared=false
May 4, 2026
08fff8e
Restore CLH VM snapshot to create VM from template
May 12, 2026
2dffe5f
Use diff VM storage paths in template_test.go
May 13, 2026
0233e8c
Add K8s E2E tests for template k8s-vm-templating-test.bats
May 14, 2026
aeaf77a
factory: do direct boot if no template VM is fetched
Camelron Jun 8, 2026
d0c37a1
runtime: Refactor factory/hypervisor save/restore paths for clearer s…
Camelron Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/runtime/pkg/katautils/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1958,12 +1958,6 @@ func checkNetNsConfig(config oci.RuntimeConfig) error {

// checkFactoryConfig ensures the VM factory configuration is valid.
func checkFactoryConfig(config oci.RuntimeConfig) error {
if config.FactoryConfig.Template {
if config.HypervisorConfig.InitrdPath == "" {
return errors.New("Factory option enable_template requires an initrd image")
}
}

if config.FactoryConfig.VMCacheNumber > 0 {
if config.HypervisorType != vc.QemuHypervisor {
return errors.New("VM cache just support qemu")
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/katautils/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,7 +1626,7 @@ func TestCheckFactoryConfig(t *testing.T) {
{false, false, "", "initrd"},

{true, false, "", "initrd"},
{true, true, "image", ""},
{true, false, "image", ""},
}

for i, d := range data {
Expand Down
6 changes: 1 addition & 5 deletions src/runtime/pkg/katautils/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,8 @@ func HandleFactory(ctx context.Context, vci vc.VC, runtimeConfig *oci.RuntimeCon
kataUtilsLogger.WithField("factory", factoryConfig).Info("load vm factory")

f, err := vf.NewFactory(ctx, factoryConfig, true)
if err != nil && !factoryConfig.VMCache {
kataUtilsLogger.WithError(err).Warn("load vm factory failed, about to create new one")
f, err = vf.NewFactory(ctx, factoryConfig, false)
}
if err != nil {
kataUtilsLogger.WithError(err).Warn("create vm factory failed")
kataUtilsLogger.WithError(err).Warn("load vm factory failed, will use direct boot")
return
}

Expand Down
Loading
Loading