From b404d00edc5136ac2392320d89831e137fbbfd5c Mon Sep 17 00:00:00 2001 From: Ellis Tarn Date: Fri, 17 Feb 2023 15:07:39 -0800 Subject: [PATCH] fix: Remove deletion webhooks (#3412) --- charts/karpenter/templates/webhooks-core.yaml | 1 - charts/karpenter/templates/webhooks.yaml | 2 -- pkg/apis/v1alpha1/awsnodetemplate_validation.go | 8 ++++++++ pkg/apis/v1alpha5/provisioner.go | 11 +++++++++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/charts/karpenter/templates/webhooks-core.yaml b/charts/karpenter/templates/webhooks-core.yaml index 13de7d2df0d9..8a10b577c2ae 100644 --- a/charts/karpenter/templates/webhooks-core.yaml +++ b/charts/karpenter/templates/webhooks-core.yaml @@ -59,7 +59,6 @@ webhooks: operations: - CREATE - UPDATE - - DELETE --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration diff --git a/charts/karpenter/templates/webhooks.yaml b/charts/karpenter/templates/webhooks.yaml index d82b47a2f8b5..415366fe8cea 100644 --- a/charts/karpenter/templates/webhooks.yaml +++ b/charts/karpenter/templates/webhooks.yaml @@ -67,7 +67,6 @@ webhooks: operations: - CREATE - UPDATE - - DELETE resources: - awsnodetemplates - awsnodetemplates/status @@ -82,4 +81,3 @@ webhooks: operations: - CREATE - UPDATE - - DELETE diff --git a/pkg/apis/v1alpha1/awsnodetemplate_validation.go b/pkg/apis/v1alpha1/awsnodetemplate_validation.go index ad5fa9345ad5..9d80298515e0 100644 --- a/pkg/apis/v1alpha1/awsnodetemplate_validation.go +++ b/pkg/apis/v1alpha1/awsnodetemplate_validation.go @@ -19,6 +19,7 @@ import ( "fmt" "regexp" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" "knative.dev/pkg/apis" "github.com/aws/karpenter-core/pkg/utils/functional" @@ -33,6 +34,13 @@ var ( amiRegex = regexp.MustCompile("ami-[0-9a-z]+") ) +func (a *AWSNodeTemplate) SupportedVerbs() []admissionregistrationv1.OperationType { + return []admissionregistrationv1.OperationType{ + admissionregistrationv1.Create, + admissionregistrationv1.Update, + } +} + func (a *AWSNodeTemplate) Validate(ctx context.Context) (errs *apis.FieldError) { return errs.Also( apis.ValidateObjectMetadata(a).ViaField("metadata"), diff --git a/pkg/apis/v1alpha5/provisioner.go b/pkg/apis/v1alpha5/provisioner.go index 16177d2964ec..f5338136697b 100644 --- a/pkg/apis/v1alpha5/provisioner.go +++ b/pkg/apis/v1alpha5/provisioner.go @@ -17,11 +17,11 @@ package v1alpha5 import ( "context" + "github.com/aws/aws-sdk-go/service/ec2" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" v1 "k8s.io/api/core/v1" "knative.dev/pkg/apis" - "github.com/aws/aws-sdk-go/service/ec2" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" "github.com/aws/karpenter-core/pkg/scheduling" "github.com/aws/karpenter/pkg/apis/v1alpha1" @@ -31,6 +31,13 @@ import ( // +kubebuilder:object:root=true type Provisioner v1alpha5.Provisioner +func (p *Provisioner) SupportedVerbs() []admissionregistrationv1.OperationType { + return []admissionregistrationv1.OperationType{ + admissionregistrationv1.Create, + admissionregistrationv1.Update, + } +} + func (p *Provisioner) Validate(ctx context.Context) (errs *apis.FieldError) { if p.Spec.Provider == nil { return nil