From 117823d40e560ee4c420dd2e4dd68070377441f0 Mon Sep 17 00:00:00 2001 From: Roman Hros Date: Tue, 19 Dec 2023 10:53:03 +0100 Subject: [PATCH] Add 'spec.template.spec' for openstackclusterstackreleasetemplate (#17) Signed-off-by: Roman Hros Co-authored-by: Matej Feder --- ...nstackclusterstackreleasetemplate_types.go | 9 ++++---- api/v1alpha1/zz_generated.deepcopy.go | 17 ++++++++++++++ ...openstackclusterstackreleasetemplates.yaml | 23 +++++++++++++++---- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/api/v1alpha1/openstackclusterstackreleasetemplate_types.go b/api/v1alpha1/openstackclusterstackreleasetemplate_types.go index f3f2f74e..2a225645 100644 --- a/api/v1alpha1/openstackclusterstackreleasetemplate_types.go +++ b/api/v1alpha1/openstackclusterstackreleasetemplate_types.go @@ -25,11 +25,12 @@ import ( // OpenstackClusterStackReleaseTemplateSpec defines the desired state of OpenstackClusterStackReleaseTemplate. type OpenstackClusterStackReleaseTemplateSpec struct { - // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "make" to regenerate code after modifying this file + Template OpenstackClusterStackReleaseTemplateResource `json:"template"` +} - // Foo is an example field of OpenstackClusterStackReleaseTemplate. Edit openstackclusterstackreleasetemplate_types.go to remove/update - Foo string `json:"foo,omitempty"` +// OpenstackClusterStackReleaseTemplateResource describes the data needed to create a OpenstackClusterStackRelease from a template. +type OpenstackClusterStackReleaseTemplateResource struct { + Spec OpenstackClusterStackReleaseSpec `json:"spec"` } // OpenstackClusterStackReleaseTemplateStatus defines the observed state of OpenstackClusterStackReleaseTemplate. diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 38df51cf..1dbcf1b2 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -172,9 +172,26 @@ func (in *OpenstackClusterStackReleaseTemplateList) DeepCopyObject() runtime.Obj return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenstackClusterStackReleaseTemplateResource) DeepCopyInto(out *OpenstackClusterStackReleaseTemplateResource) { + *out = *in + out.Spec = in.Spec +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenstackClusterStackReleaseTemplateResource. +func (in *OpenstackClusterStackReleaseTemplateResource) DeepCopy() *OpenstackClusterStackReleaseTemplateResource { + if in == nil { + return nil + } + out := new(OpenstackClusterStackReleaseTemplateResource) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OpenstackClusterStackReleaseTemplateSpec) DeepCopyInto(out *OpenstackClusterStackReleaseTemplateSpec) { *out = *in + out.Template = in.Template } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenstackClusterStackReleaseTemplateSpec. diff --git a/config/crd/bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml b/config/crd/bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml index 7cb63ea3..c7bcfd53 100644 --- a/config/crd/bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml +++ b/config/crd/bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml @@ -36,10 +36,25 @@ spec: description: OpenstackClusterStackReleaseTemplateSpec defines the desired state of OpenstackClusterStackReleaseTemplate. properties: - foo: - description: Foo is an example field of OpenstackClusterStackReleaseTemplate. - Edit openstackclusterstackreleasetemplate_types.go to remove/update - type: string + template: + description: OpenstackClusterStackReleaseTemplateResource describes + the data needed to create a OpenstackClusterStackRelease from a + template. + properties: + spec: + description: OpenstackClusterStackReleaseSpec defines the desired + state of OpenstackClusterStackRelease. + properties: + foo: + description: Foo is an example field of OpenstackClusterStackRelease. + Edit openstackclusterstackrelease_types.go to remove/update + type: string + type: object + required: + - spec + type: object + required: + - template type: object status: description: OpenstackClusterStackReleaseTemplateStatus defines the observed