From 4b1944588226d588993dabf410f33c5d9890ee68 Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Fri, 24 Jan 2025 15:06:42 +0100 Subject: [PATCH] Fix Class Signed-off-by: Dinar Valeev --- config/crd/kustomization.yaml | 1 - .../eks/api/v1beta2/awsmanagedcontrolplanetemplate_webhook.go | 2 +- exp/api/v1beta2/awsmanagedmachinepooltemplate_webhook.go | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 324378a5c8..5641552e70 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -38,7 +38,6 @@ patchesStrategicMerge: - patches/webhook_in_awsclusterroleidentities.yaml - patches/webhook_in_awsclustertemplates.yaml - patches/webhook_in_awsmanagedcontrolplanes.yaml -- patches/webhook_in_awsmanagedcontrolplanetemplates.yaml - patches/webhook_in_eksconfigs.yaml - patches/webhook_in_eksconfigtemplates.yaml # +kubebuilder:scaffold:crdkustomizewebhookpatch diff --git a/controlplane/eks/api/v1beta2/awsmanagedcontrolplanetemplate_webhook.go b/controlplane/eks/api/v1beta2/awsmanagedcontrolplanetemplate_webhook.go index 55a37d1cc2..d1165dc379 100644 --- a/controlplane/eks/api/v1beta2/awsmanagedcontrolplanetemplate_webhook.go +++ b/controlplane/eks/api/v1beta2/awsmanagedcontrolplanetemplate_webhook.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) -// SetupWebhookWithManager will setup the webhooks for the AWSManagedControlPlane. +// SetupWebhookWithManager will setup the webhooks for the AWSManagedControlPlaneTemplate. func (rt *AWSManagedControlPlaneTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error { return ctrl.NewWebhookManagedBy(mgr). For(rt). diff --git a/exp/api/v1beta2/awsmanagedmachinepooltemplate_webhook.go b/exp/api/v1beta2/awsmanagedmachinepooltemplate_webhook.go index f0990b71b1..376fcaea78 100644 --- a/exp/api/v1beta2/awsmanagedmachinepooltemplate_webhook.go +++ b/exp/api/v1beta2/awsmanagedmachinepooltemplate_webhook.go @@ -37,8 +37,8 @@ func (rt *AWSManagedMachinePoolTemplate) SetupWebhookWithManager(mgr ctrl.Manage // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-awsmanagedmachinepooltemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=awsmanagedmachinepooltemplates,versions=v1beta2,name=validation.awsmanagedmachinepooltemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-awsmanagedmachinepooltemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=awsmanagedmachinepooltemplates,versions=v1beta2,name=default.awsmanagedmachinepooltemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 -var _ webhook.Defaulter = &AWSManagedMachinePool{} -var _ webhook.Validator = &AWSManagedMachinePool{} +var _ webhook.Defaulter = &AWSManagedMachinePoolTemplate{} +var _ webhook.Validator = &AWSManagedMachinePoolTemplate{} // ValidateCreate will do any extra validation when creating a AWSManagedMachinePoolTemplate. func (rt *AWSManagedMachinePoolTemplate) ValidateCreate() (admission.Warnings, error) {