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: Update kernel matrix with Cloud Hypervisor #55

Merged
merged 1 commit into from
Feb 16, 2023
Merged

feat: Update kernel matrix with Cloud Hypervisor #55

merged 1 commit into from
Feb 16, 2023

Conversation

Callisto13
Copy link
Member

@Callisto13 Callisto13 commented Jan 17, 2023

This is fairly simple to do now that the modules are mounted in separately.

Here I have restructured the kernel directory to build both firecracker and cloud-hypervisor images. Whichever you are using, the CAPMVM root image will be the same as there is no connection anymore.

kernel/
├── bin
│   └── Dockerfile
├── builder
│   └── Dockerfile
├── cloud-hypervisor
│   ├── base
│   │   └── Dockerfile
│   └── configs
│       └── linux-x86_64-5.12.config
├── firecracker
│   ├── base
│   │   └── Dockerfile
│   └── configs
│       ├── linux-x86_64-4.19.215.config
│       └── linux-x86_64-5.10.77.config
├── Makefile
├── modules
│   └── Dockerfile
└── README.md

The readme has been updated to describe the sequence and how images relate to each other.

Tested against the CH pr in flintlock with this hammertime spec:

{
    "id": "mvm1",
    "namespace": "ns1",
    "vcpu": 2,
    "memory_in_mb": 2048,
    "kernel": {
      "image": "docker.io/claudiaberesford/cloudhypervisor-kernel-bin:5.12",
      "filename": "boot/vmlinux.bin",
      "add_network_config": true
    },
    "root_volume": {
      "id": "root",
      "is_read_only": false,
      "source": {
        "container_source": "docker.io/claudiaberesford/capmvm-k8s-os:1.23.5"
      }
    },
    "additional_volumes": [
      {
        "id": "modules",
        "is_read_only": false,
        "source": {
          "container_source": "docker.io/claudiaberesford/cloudhypervisor-kernel-modules:5.12"
        },
        "mount_point": "/lib/modules/5.10.77"
      }
    ],
    "interfaces": [
      {
        "device_id": "eth1",
        "guest_mac": "7e:f5:45:49:38:e0",
        "type": 0
      }
    ],
    "metadata": {
      "meta-data": "aW5zdGFuY2VfaWQ6IG5zMS9tdm0wCmxvY2FsX2hvc3RuYW1lOiBtdm0wCnBsYXRmb3JtOiBsaXF1aWRfbWV0YWwK",
      "user-data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogbXZtMApmcWRuOiBtdm0wLmZydWl0Y2FzZQp1c2VyczoKICAgIC0gbmFtZTogcm9vdAogICAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAgIC0gfAogICAgICAgICAgc3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUdzbStWSSsyVk5WWFBDRmVmbFhrQTVKY21zMzByajFGUFFjcFNTdDFrdVYgcmljaGFyZEB3ZWF2ZS53b3JrcwpkaXNhYmxlX3Jvb3Q6IGZhbHNlCnBhY2thZ2VfdXBkYXRlOiBmYWxzZQpmaW5hbF9tZXNzYWdlOiBUaGUgcmVpZ25pdGVkIGJvb3RlZCBzeXN0ZW0gaXMgZ29vZCB0byBnbyBhZnRlciAkVVBUSU1FIHNlY29uZHMKcnVuY21kOgogICAgLSBkaGNsaWVudCAtcgogICAgLSBkaGNsaWVudAo="
    }
}

@Callisto13
Copy link
Member Author

@richardcase this is looking doable with minimal duplication. Will test these images with your PR tomorrow

Copy link

@yitsushi yitsushi left a comment

Choose a reason for hiding this comment

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

lgtm :shipit:

@Callisto13 Callisto13 merged commit bf097d2 into main Feb 16, 2023
@Callisto13 Callisto13 deleted the v2-ch branch February 16, 2023 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants