From 8503b1f1ec2839fce91ea8e391ddad0cb3f2cad9 Mon Sep 17 00:00:00 2001 From: Hardik Dodiya Date: Mon, 6 May 2024 11:42:39 +0000 Subject: [PATCH] Update APIs for the HTTPBootConfig --- api/v1alpha1/httpbootconfig_types.go | 10 +--------- api/v1alpha1/zz_generated.deepcopy.go | 7 ++++++- .../crd/bases/boot.ironcore.dev_httpbootconfigs.yaml | 12 ------------ 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/api/v1alpha1/httpbootconfig_types.go b/api/v1alpha1/httpbootconfig_types.go index 3d38849b..e1092050 100644 --- a/api/v1alpha1/httpbootconfig_types.go +++ b/api/v1alpha1/httpbootconfig_types.go @@ -10,16 +10,8 @@ import ( // HTTPBootConfigSpec defines the desired state of HTTPBootConfig type HTTPBootConfigSpec struct { - SystemUUID string `json:"systemUUID,omitempty"` - SystemIPs []string `json:"systemIP,omitempty"` // TODO: Add the custom serialization. For now validate at the controller. - - KernelURL string `json:"kernelURL,omitempty"` - InitrdURL string `json:"initrdURL,omitempty"` - SquashfsURL string `json:"squashfsURL,omitempty"` - + SystemUUID string `json:"systemUUID,omitempty"` IgnitionSecretRef *corev1.LocalObjectReference `json:"ignitionSecretRef,omitempty"` - - CmdLine string `json:"cmdLine,omitempty"` } // HTTPBootConfigStatus defines the observed state of HTTPBootConfig diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 7a7967c5..23c34053 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -17,7 +17,7 @@ func (in *HTTPBootConfig) DeepCopyInto(out *HTTPBootConfig) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec + in.Spec.DeepCopyInto(&out.Spec) out.Status = in.Status } @@ -74,6 +74,11 @@ func (in *HTTPBootConfigList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HTTPBootConfigSpec) DeepCopyInto(out *HTTPBootConfigSpec) { *out = *in + if in.IgnitionSecretRef != nil { + in, out := &in.IgnitionSecretRef, &out.IgnitionSecretRef + *out = new(v1.LocalObjectReference) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPBootConfigSpec. diff --git a/config/crd/bases/boot.ironcore.dev_httpbootconfigs.yaml b/config/crd/bases/boot.ironcore.dev_httpbootconfigs.yaml index 1f4bb221..bb49fe93 100644 --- a/config/crd/bases/boot.ironcore.dev_httpbootconfigs.yaml +++ b/config/crd/bases/boot.ironcore.dev_httpbootconfigs.yaml @@ -39,8 +39,6 @@ spec: spec: description: HTTPBootConfigSpec defines the desired state of HTTPBootConfig properties: - cmdLine: - type: string ignitionSecretRef: description: |- LocalObjectReference contains enough information to let you locate the @@ -54,16 +52,6 @@ spec: type: string type: object x-kubernetes-map-type: atomic - initrdURL: - type: string - kernelURL: - type: string - squashfsURL: - type: string - systemIP: - items: - type: string - type: array systemUUID: type: string type: object