From 32971c8c16219bb42efd8a4ec83c6881c2a34cf1 Mon Sep 17 00:00:00 2001 From: Balazs Nadasdi Date: Tue, 14 Dec 2021 12:02:53 +0100 Subject: [PATCH] feat: Change machine api to `additional kernel args` Update flintlock/api --- api/v1alpha1/types.go | 8 ++++---- .../infrastructure.cluster.x-k8s.io_microvmmachines.yaml | 7 +++---- ...ructure.cluster.x-k8s.io_microvmmachinetemplates.yaml | 9 ++++----- go.mod | 4 ++-- go.sum | 4 ++++ 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/api/v1alpha1/types.go b/api/v1alpha1/types.go index 609eebc..43817b4 100644 --- a/api/v1alpha1/types.go +++ b/api/v1alpha1/types.go @@ -31,10 +31,10 @@ type MicrovmSpec struct { // +kubebuilder:validation:Required Kernel ContainerFileSource `json:"kernel"` - // KernelCmdLine are the args to use for the kernel cmdline. - // +kubebuilder:validation:MinLength:=5 - // +kubebuilder:default:=console=ttyS0 reboot=k panic=1 pci=off i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd - KernelCmdLine string `json:"kernelCmdline,omitempty"` + // KernelCmdLine are the additional args to use for the kernel cmdline. + // Each MicroVM provider has its own recommended list, they will be used + // automatically. This field is for additional values. + KernelCmdLine map[string]string `json:"kernelCmdline,omitempty"` // Initrd is an optional initial ramdisk to use. // +optional diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml index ba2a748..f504522 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml @@ -62,10 +62,9 @@ spec: - image type: object kernelCmdline: - default: console=ttyS0 reboot=k panic=1 pci=off i8042.noaux i8042.nomux - i8042.nopnp i8042.dumbkbd - description: KernelCmdLine are the args to use for the kernel cmdline. - minLength: 5 + description: KernelCmdLine are the additional args to use for the + kernel cmdline. Each MicroVM provider has its own recommended list, + they will be used automatically. This field is for additional values. type: string memoryMb: description: MemoryMb is the amount of memory in megabytes that the diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml index be75a59..7327be6 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml @@ -96,11 +96,10 @@ spec: - image type: object kernelCmdline: - default: console=ttyS0 reboot=k panic=1 pci=off i8042.noaux - i8042.nomux i8042.nopnp i8042.dumbkbd - description: KernelCmdLine are the args to use for the kernel - cmdline. - minLength: 5 + description: KernelCmdLine are the additional args to use + for the kernel cmdline. Each MicroVM provider has its own + recommended list, they will be used automatically. This + field is for additional values. type: string memoryMb: description: MemoryMb is the amount of memory in megabytes diff --git a/go.mod b/go.mod index e070e95..6ac80a3 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/go-logr/logr v0.4.0 github.com/onsi/gomega v1.17.0 github.com/spf13/pflag v1.0.5 - github.com/weaveworks/flintlock/api v0.0.0-20220110105514-c0ec7b5054ee - github.com/weaveworks/flintlock/client v0.0.0-20220107100311-6a2445a32861 + github.com/weaveworks/flintlock/api v0.0.0-20220125102832-37e5343a008e + github.com/weaveworks/flintlock/client v0.0.0-20220125102832-37e5343a008e github.com/yitsushi/macpot v1.0.2 google.golang.org/grpc v1.42.0 google.golang.org/protobuf v1.27.1 diff --git a/go.sum b/go.sum index 1ec5655..51f36c7 100644 --- a/go.sum +++ b/go.sum @@ -546,10 +546,14 @@ github.com/weaveworks/flintlock/api v0.0.0-20211124154423-21a022445576 h1:f5QFSz github.com/weaveworks/flintlock/api v0.0.0-20211124154423-21a022445576/go.mod h1:RFgQ7RSa7zGNxxR+dS6NRDCQ/IAN23WCfXg4+L6fclI= github.com/weaveworks/flintlock/api v0.0.0-20220110105514-c0ec7b5054ee h1:MbRMHRZT3k1zU/QF3Q6QYcZyA+yq+ghBJnuUm2hXzAM= github.com/weaveworks/flintlock/api v0.0.0-20220110105514-c0ec7b5054ee/go.mod h1:RFgQ7RSa7zGNxxR+dS6NRDCQ/IAN23WCfXg4+L6fclI= +github.com/weaveworks/flintlock/api v0.0.0-20220125102832-37e5343a008e h1:s2+3pEL4cR7y6llBZdNYFzBBq2pXYsg/UbwtgyXIkSU= +github.com/weaveworks/flintlock/api v0.0.0-20220125102832-37e5343a008e/go.mod h1:RFgQ7RSa7zGNxxR+dS6NRDCQ/IAN23WCfXg4+L6fclI= github.com/weaveworks/flintlock/client v0.0.0-20211213135217-19cc344a892b h1:CerxjKG6oiUPfEDlJA8SwzR/5cCybzg8sQJ/999KXJ0= github.com/weaveworks/flintlock/client v0.0.0-20211213135217-19cc344a892b/go.mod h1:1jiepUOR2kxAdoxXXyNQ0LnOeT2gOUSnWGuXh9akjDw= github.com/weaveworks/flintlock/client v0.0.0-20220107100311-6a2445a32861 h1:UH27IkZjwbcNDJLXX83p8BQHxploHG55X6vzLlsBilg= github.com/weaveworks/flintlock/client v0.0.0-20220107100311-6a2445a32861/go.mod h1:1jiepUOR2kxAdoxXXyNQ0LnOeT2gOUSnWGuXh9akjDw= +github.com/weaveworks/flintlock/client v0.0.0-20220125102832-37e5343a008e h1:P8WJg8wYrGFAvL77vsQL3tyQwNT1eL6F815hhgkynYg= +github.com/weaveworks/flintlock/client v0.0.0-20220125102832-37e5343a008e/go.mod h1:1jiepUOR2kxAdoxXXyNQ0LnOeT2gOUSnWGuXh9akjDw= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=