fix: Remove deletion webhooks (aws#3412)

YusukeSugiyamaTG · Feb 17, 2023 · b404d00 · b404d00
1 parent f06e4b6
commit b404d00
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,6 @@ webhooks: @@
             operations:
               - CREATE
               - UPDATE
-              - DELETE
     ---
     apiVersion: admissionregistration.k8s.io/v1
     kind: ValidatingWebhookConfiguration
@@ Expand Down @@