Support multiple webhook configurations in init

Signed-off-by: Hasan Turken <turkenh@gmail.com>
turkenh · Sep 11, 2023 · f9aca52 · f9aca52
1 parent 221ab17
commit f9aca52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cluster/webhookconfigurations/usage.yaml b/cluster/webhookconfigurations/usage.yaml
@@ -2,7 +2,7 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  name: usage-webhook-configuration
+  name: crossplane-no-usages
 webhooks:
   - admissionReviewVersions:
       - v1

diff --git a/internal/initializer/webhook_configurations.go b/internal/initializer/webhook_configurations.go
@@ -112,7 +112,9 @@ func (c *WebhookConfigurations) Run(ctx context.Context, kube client.Client) err
 				conf.Webhooks[i].ClientConfig.Service.Port = c.ServiceReference.Port
 			}
 			// See https://github.com/kubernetes-sigs/controller-tools/issues/658
-			conf.SetName("crossplane")
+			if conf.GetName() == "validating-webhook-configuration" {
+				conf.SetName("crossplane")
+			}
 		case *admv1.MutatingWebhookConfiguration:
 			for i := range conf.Webhooks {
 				conf.Webhooks[i].ClientConfig.CABundle = caBundle
@@ -121,7 +123,9 @@ func (c *WebhookConfigurations) Run(ctx context.Context, kube client.Client) err
 				conf.Webhooks[i].ClientConfig.Service.Port = c.ServiceReference.Port
 			}
 			// See https://github.com/kubernetes-sigs/controller-tools/issues/658
-			conf.SetName("crossplane")
+			if conf.GetName() == "mutating-webhook-configuration" {
+				conf.SetName("crossplane")
+			}
 		default:
 			return errors.Errorf("only MutatingWebhookConfiguration and ValidatingWebhookConfiguration kinds are accepted, got %T", obj)
 		}