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.

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

DiskOffering in CloudStackMachine CRD should be a pointer to CloudStackResourceDiskOffering #359

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

DiskOffering in CloudStackMachine CRD should be a pointer to CloudStackResourceDiskOffering #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a0132c
DiskOffering is optional and thus should be a ptr
hrak Dec 6, 2023
3b3fec0
Fix conversion-gen
hrak Dec 11, 2023
8dc59b2
Set matchPolicy: Equivalent and update webhook names
hrak Dec 11, 2023
932469e
Fixup
vishesh92 May 24, 2024
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
26 changes: 21 additions & 5 deletions api/v1beta1/cloudstackmachine_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

func (src *CloudStackMachine) ConvertTo(dstRaw conversion.Hub) error { // nolint
dst := dstRaw.(*v1beta3.CloudStackMachine)

if err := Convert_v1beta1_CloudStackMachine_To_v1beta3_CloudStackMachine(src, dst, nil); err != nil {
return err
}
Expand All @@ -34,12 +35,22 @@ func (src *CloudStackMachine) ConvertTo(dstRaw conversion.Hub) error { // nolint
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
return err
}
if restored.Spec.FailureDomainName != "" {
dst.Spec.FailureDomainName = restored.Spec.FailureDomainName
}
if restored.Spec.UncompressedUserData != nil {
dst.Spec.UncompressedUserData = restored.Spec.UncompressedUserData
dst.Spec.FailureDomainName = restored.Spec.FailureDomainName
dst.Spec.UncompressedUserData = restored.Spec.UncompressedUserData

// Don't bother converting empty disk offering objects
if restored.Spec.DiskOffering.MountPath != "" {
dst.Spec.DiskOffering = &v1beta3.CloudStackResourceDiskOffering{
CustomSize: restored.Spec.DiskOffering.CustomSize,
MountPath: restored.Spec.DiskOffering.MountPath,
Device: restored.Spec.DiskOffering.Device,
Filesystem: restored.Spec.DiskOffering.Filesystem,
Label: restored.Spec.DiskOffering.Label,
}
dst.Spec.DiskOffering.ID = restored.Spec.DiskOffering.ID
dst.Spec.DiskOffering.Name = restored.Spec.DiskOffering.Name
}

if restored.Status.Status != nil {
dst.Status.Status = restored.Status.Status
}
Expand All @@ -51,6 +62,7 @@ func (src *CloudStackMachine) ConvertTo(dstRaw conversion.Hub) error { // nolint

func (dst *CloudStackMachine) ConvertFrom(srcRaw conversion.Hub) error { // nolint
src := srcRaw.(*v1beta3.CloudStackMachine)

if err := Convert_v1beta3_CloudStackMachine_To_v1beta1_CloudStackMachine(src, dst, nil); err != nil {
return err
}
Expand All @@ -62,6 +74,10 @@ func (dst *CloudStackMachine) ConvertFrom(srcRaw conversion.Hub) error { // noli
return nil
}

func Convert_v1beta1_CloudStackMachineSpec_To_v1beta3_CloudStackMachineSpec(in *CloudStackMachineSpec, out *v1beta3.CloudStackMachineSpec, scope machineryconversion.Scope) error { // nolint
return autoConvert_v1beta1_CloudStackMachineSpec_To_v1beta3_CloudStackMachineSpec(in, out, scope)
}

func Convert_v1beta3_CloudStackMachineSpec_To_v1beta1_CloudStackMachineSpec(in *v1beta3.CloudStackMachineSpec, out *CloudStackMachineSpec, s machineryconversion.Scope) error { // nolint
return autoConvert_v1beta3_CloudStackMachineSpec_To_v1beta1_CloudStackMachineSpec(in, out, s)
}
Expand Down
23 changes: 7 additions & 16 deletions api/v1beta1/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 44 additions & 3 deletions api/v1beta2/cloudstackmachine_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,57 @@ limitations under the License.
package v1beta2

import (
machineryconversion "k8s.io/apimachinery/pkg/conversion"
"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

func (src *CloudStackMachine) ConvertTo(dstRaw conversion.Hub) error { // nolint
func (src *CloudStackMachine) ConvertTo(dstRaw conversion.Hub) error {
dst := dstRaw.(*v1beta3.CloudStackMachine)
return Convert_v1beta2_CloudStackMachine_To_v1beta3_CloudStackMachine(src, dst, nil)

if err := Convert_v1beta2_CloudStackMachine_To_v1beta3_CloudStackMachine(src, dst, nil); err != nil {
return err
}

// Manually restore data
restored := &v1beta3.CloudStackMachine{}
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
return err
}
// Don't bother converting empty disk offering objects
if restored.Spec.DiskOffering.MountPath != "" {
dst.Spec.DiskOffering = &v1beta3.CloudStackResourceDiskOffering{
CustomSize: restored.Spec.DiskOffering.CustomSize,
MountPath: restored.Spec.DiskOffering.MountPath,
Device: restored.Spec.DiskOffering.Device,
Filesystem: restored.Spec.DiskOffering.Filesystem,
Label: restored.Spec.DiskOffering.Label,
}
dst.Spec.DiskOffering.ID = restored.Spec.DiskOffering.ID
dst.Spec.DiskOffering.Name = restored.Spec.DiskOffering.Name
}
return nil
}

func (dst *CloudStackMachine) ConvertFrom(srcRaw conversion.Hub) error { // nolint
src := srcRaw.(*v1beta3.CloudStackMachine)
return Convert_v1beta3_CloudStackMachine_To_v1beta2_CloudStackMachine(src, dst, nil)

if err := Convert_v1beta3_CloudStackMachine_To_v1beta2_CloudStackMachine(src, dst, nil); err != nil {
return err
}

// Preserve Hub data on down-conversion
if err := utilconversion.MarshalData(src, dst); err != nil {
return err
}
return nil
}

func Convert_v1beta3_CloudStackMachineSpec_To_v1beta2_CloudStackMachineSpec(in *v1beta3.CloudStackMachineSpec, out *CloudStackMachineSpec, s machineryconversion.Scope) error { // nolint
return autoConvert_v1beta3_CloudStackMachineSpec_To_v1beta2_CloudStackMachineSpec(in, out, s)
}

func Convert_v1beta2_CloudStackMachineSpec_To_v1beta3_CloudStackMachineSpec(in *CloudStackMachineSpec, out *v1beta3.CloudStackMachineSpec, s machineryconversion.Scope) error { // nolint
return autoConvert_v1beta2_CloudStackMachineSpec_To_v1beta3_CloudStackMachineSpec(in, out, s)
}
62 changes: 34 additions & 28 deletions api/v1beta2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions api/v1beta3/cloudstackcluster_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ func (r *CloudStackCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
Complete()
}

//+kubebuilder:webhook:path=/mutate-infrastructure-cluster-x-k8s-io-v1beta3-cloudstackcluster,mutating=true,failurePolicy=fail,sideEffects=None,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters,verbs=create;update,versions=v1beta3,name=mcloudstackcluster.kb.io,admissionReviewVersions=v1;v1beta1
// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta3-cloudstackcluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters,versions=v1beta3,name=validation.cloudstackcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta3-cloudstackcluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters,versions=v1beta3,name=default.cloudstackcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1

var _ webhook.Defaulter = &CloudStackCluster{}
var (
_ webhook.Defaulter = &CloudStackCluster{}
_ webhook.Validator = &CloudStackCluster{}
)

// Default implements webhook.Defaulter so a webhook will be registered for the type
func (r *CloudStackCluster) Default() {
cloudstackclusterlog.V(1).Info("entered api default setting webhook", "api resource name", r.Name)
// No defaulted values supported yet.
}

// +kubebuilder:webhook:name=vcloudstackcluster.kb.io,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters,versions=v1beta3,verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta3-cloudstackcluster,mutating=false,failurePolicy=fail,sideEffects=None,admissionReviewVersions=v1;v1beta1

var _ webhook.Validator = &CloudStackCluster{}

// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
func (r *CloudStackCluster) ValidateCreate() error {
cloudstackclusterlog.V(1).Info("entered validate create webhook", "api resource name", r.Name)
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta3/cloudstackmachine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type CloudStackMachineSpec struct {

// CloudStack disk offering to use.
// +optional
DiskOffering CloudStackResourceDiskOffering `json:"diskOffering,omitempty"`
DiskOffering *CloudStackResourceDiskOffering `json:"diskOffering,omitempty"`

// CloudStack ssh key to use.
// +optional
Expand Down
Loading
Loading