Skip to content

Commit e6bb34f

Browse files
authored
Merge pull request #1920 from shiftstack/webhooks
🌱 Move webhooks into pkg/webhooks
2 parents 23b9f34 + cb09d5f commit e6bb34f

21 files changed

+659
-694
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ generate-conversion-gen: $(CONVERSION_GEN)
274274
.PHONY: generate-manifests
275275
generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
276276
$(CONTROLLER_GEN) \
277-
paths=./api/... \
277+
paths=./pkg/webhooks/... \
278278
crd:crdVersions=v1 \
279279
output:crd:dir=$(CRD_ROOT) \
280280
output:webhook:dir=$(WEBHOOK_ROOT) \

api/v1alpha5/conversion.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,18 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
101101
return utilconversion.MarshalData(src, r)
102102
}
103103

104+
var _ ctrlconversion.Convertible = &OpenStackClusterTemplateList{}
105+
106+
func (r *OpenStackClusterTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error {
107+
dst := dstRaw.(*infrav1.OpenStackClusterTemplateList)
108+
return Convert_v1alpha5_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(r, dst, nil)
109+
}
110+
111+
func (r *OpenStackClusterTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
112+
src := srcRaw.(*infrav1.OpenStackClusterTemplateList)
113+
return Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(src, r, nil)
114+
}
115+
104116
var _ ctrlconversion.Convertible = &OpenStackMachine{}
105117

106118
func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error {

api/v1alpha6/conversion.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,18 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
429429
)
430430
}
431431

432+
var _ ctrlconversion.Convertible = &OpenStackClusterTemplateList{}
433+
434+
func (r *OpenStackClusterTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error {
435+
dst := dstRaw.(*infrav1.OpenStackClusterTemplateList)
436+
return Convert_v1alpha6_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(r, dst, nil)
437+
}
438+
439+
func (r *OpenStackClusterTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
440+
src := srcRaw.(*infrav1.OpenStackClusterTemplateList)
441+
return Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(src, r, nil)
442+
}
443+
432444
var _ ctrlconversion.Convertible = &OpenStackMachine{}
433445

434446
var v1alpha6OpenStackMachineRestorer = conversion.RestorerFor[*OpenStackMachine]{

api/v1alpha7/conversion.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,18 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
487487
)
488488
}
489489

490+
var _ ctrlconversion.Convertible = &OpenStackClusterTemplateList{}
491+
492+
func (r *OpenStackClusterTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error {
493+
dst := dstRaw.(*infrav1.OpenStackClusterTemplateList)
494+
return Convert_v1alpha7_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(r, dst, nil)
495+
}
496+
497+
func (r *OpenStackClusterTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
498+
src := srcRaw.(*infrav1.OpenStackClusterTemplateList)
499+
return Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(src, r, nil)
500+
}
501+
490502
var _ ctrlconversion.Convertible = &OpenStackMachine{}
491503

492504
var v1alpha7OpenStackMachineRestorer = conversion.RestorerFor[*OpenStackMachine]{

api/v1beta1/openstackcluster_webhook.go

Lines changed: 0 additions & 156 deletions
This file was deleted.

api/v1beta1/openstackclusterlist_webhook.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

api/v1beta1/openstackclustertemplate_webhook.go

Lines changed: 0 additions & 78 deletions
This file was deleted.

api/v1beta1/openstackmachinelist_webhook.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)