fix conflict w/ upstream

aws · Jul 11, 2024 · d82337f · d82337f
1 parent fbbad81
commit d82337f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/charts/karpenter/templates/clusterrole-core.yaml b/charts/karpenter/templates/clusterrole-core.yaml
@@ -63,7 +63,6 @@ rules:
   - apiGroups: [""]
     resources: ["pods/eviction"]
     verbs: ["create"]
-    resourceNames: ["validation.webhook.karpenter.sh", "validation.webhook.config.karpenter.sh"]
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
     verbs: ["update"]

diff --git a/pkg/webhooks/webhooks.go b/pkg/webhooks/webhooks.go
@@ -50,7 +50,7 @@ func NewWebhooks() []knativeinjection.ControllerConstructor {
 
 func NewCRDConversionWebhook(ctx context.Context, _ configmap.Watcher) *controller.Impl {
 	return conversion.NewConversionController(ctx,
-		"/conversion/karpenter.sh",
+		"/conversion/karpenter.k8s.aws",
 		ConversionResource,
 		func(ctx context.Context) context.Context { return ctx },
 	)