Add webhooks for machines (#234)

kubernetes-sigs · Mar 9, 2023 · 7c33b16 · 7c33b16
1 parent c74476b
commit 7c33b16
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 107 deletions.
diff --git a/charts/karpenter-core/templates/webhooks.yaml b/charts/karpenter-core/templates/webhooks.yaml
@@ -1,35 +1,4 @@
 apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  name: defaulting.webhook.karpenter.sh
-  labels:
-    {{- include "karpenter.labels" . | nindent 4 }}
-  {{- with .Values.additionalAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-webhooks:
-  - name: defaulting.webhook.karpenter.sh
-    admissionReviewVersions: ["v1"]
-    clientConfig:
-      service:
-        name: {{ include "karpenter.fullname" . }}
-        namespace: {{ .Release.Namespace }}
-    failurePolicy: Fail
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - karpenter.sh
-        apiVersions:
-          - v1alpha5
-        resources:
-          - provisioners
-          - provisioners/status
-        operations:
-          - CREATE
-          - UPDATE
----
-apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: validation.webhook.karpenter.sh

diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go
@@ -17,12 +17,9 @@ package apis
 import (
 	_ "embed"
 
+	"github.com/samber/lo"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"knative.dev/pkg/webhook/resourcesemantics"
-
-	"github.com/samber/lo"
 
 	"github.com/aws/karpenter-core/pkg/apis/settings"
 	"github.com/aws/karpenter-core/pkg/apis/v1alpha5"
@@ -36,12 +33,7 @@ var (
 	)
 	// AddToScheme may be used to add all resources defined in the project to a Scheme
 	AddToScheme = Builder.AddToScheme
-	// Resources defined in the project
-	Resources = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
-		v1alpha5.SchemeGroupVersion.WithKind("Provisioner"): &v1alpha5.Provisioner{},
-		v1alpha5.SchemeGroupVersion.WithKind("Machine"):     &v1alpha5.Machine{},
-	}
-	Settings = []settings.Injectable{&settings.Settings{}}
+	Settings    = []settings.Injectable{&settings.Settings{}}
 )
 
 //go:generate controller-gen crd object:headerFile="../../hack/boilerplate.go.txt" paths="./..." output:crd:artifacts:config=crds

diff --git a/pkg/apis/v1alpha5/machine_defaults.go b/pkg/apis/v1alpha5/machine_defaults.go
diff --git a/pkg/apis/v1alpha5/machine_validation.go b/pkg/apis/v1alpha5/machine_validation.go
diff --git a/pkg/apis/v1alpha5/provisioner_defaults.go b/pkg/apis/v1alpha5/provisioner_defaults.go
@@ -19,5 +19,4 @@ import (
 )
 
 // SetDefaults for the provisioner
-func (p *Provisioner) SetDefaults(ctx context.Context) {
-}
+func (p *Provisioner) SetDefaults(_ context.Context) {}
diff --git a/pkg/controllers/machine/controller.go b/pkg/controllers/machine/controller.go
@@ -186,7 +186,6 @@ func (c *Controller) cleanupNodeForMachine(ctx context.Context, machine *v1alpha
 	}
 	if err = c.terminator.Drain(ctx, node); err != nil {
 		if terminator.IsNodeDrainError(err) {
-			logging.FromContext(ctx).Errorf("%s", err)
 			c.recorder.Publish(terminatorevents.NodeFailedToDrain(node, err))
 		}
 		return fmt.Errorf("draining node, %w", err)

diff --git a/pkg/webhooks/webhooks.go b/pkg/webhooks/webhooks.go
@@ -17,43 +17,33 @@ package webhooks
 import (
 	"context"
 
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	knativeinjection "knative.dev/pkg/injection"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/webhook/certificates"
 	"knative.dev/pkg/webhook/configmaps"
-	"knative.dev/pkg/webhook/resourcesemantics/defaulting"
+	"knative.dev/pkg/webhook/resourcesemantics"
 	"knative.dev/pkg/webhook/resourcesemantics/validation"
 
-	"github.com/aws/karpenter-core/pkg/apis"
+	"github.com/aws/karpenter-core/pkg/apis/v1alpha5"
 )
 
 func NewWebhooks() []knativeinjection.ControllerConstructor {
 	return []knativeinjection.ControllerConstructor{
 		certificates.NewController,
-		NewCRDDefaultingWebhook,
 		NewCRDValidationWebhook,
 		NewConfigValidationWebhook,
 	}
 }
 
-func NewCRDDefaultingWebhook(ctx context.Context, w configmap.Watcher) *controller.Impl {
-	return defaulting.NewAdmissionController(ctx,
-		"defaulting.webhook.karpenter.sh",
-		"/default/karpenter.sh",
-		apis.Resources,
-		InjectContext,
-		true,
-	)
-}
-
 func NewCRDValidationWebhook(ctx context.Context, w configmap.Watcher) *controller.Impl {
 	return validation.NewAdmissionController(ctx,
 		"validation.webhook.karpenter.sh",
 		"/validate/karpenter.sh",
-		apis.Resources,
-		InjectContext,
+		Resources,
+		func(ctx context.Context) context.Context { return ctx },
 		true,
 	)
 }
@@ -68,6 +58,6 @@ func NewConfigValidationWebhook(ctx context.Context, cmw configmap.Watcher) *con
 	)
 }
 
-func InjectContext(ctx context.Context) context.Context {
-	return ctx
+var Resources = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
+	v1alpha5.SchemeGroupVersion.WithKind("Provisioner"): &v1alpha5.Provisioner{},
 }