From d8fe37e73621368162b7c84a7ac84592e06fc9c5 Mon Sep 17 00:00:00 2001
From: Robbie Cronin <robert.cronin@uqconnect.edu.au>
Date: Mon, 27 May 2024 15:54:51 +1000
Subject: [PATCH] Fix: ValidatingWebhookConfiguration conflict (#2947)

---
 charts/fission-all/templates/webhook-server/webhooks.yaml | 2 +-
 test/e2e/framework/webhook-manifest.yaml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/fission-all/templates/webhook-server/webhooks.yaml b/charts/fission-all/templates/webhook-server/webhooks.yaml
index 7fe21528..1578896a 100644
--- a/charts/fission-all/templates/webhook-server/webhooks.yaml
+++ b/charts/fission-all/templates/webhook-server/webhooks.yaml
@@ -49,7 +49,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   creationTimestamp: null
-  name: validating-webhook-configuration
+  name: fission-validating-webhooks
   {{- if $certManagerEnabled }}
   annotations:
     cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/fission-webhook-cert"
diff --git a/test/e2e/framework/webhook-manifest.yaml b/test/e2e/framework/webhook-manifest.yaml
index eac15e5b..7a649ce8 100644
--- a/test/e2e/framework/webhook-manifest.yaml
+++ b/test/e2e/framework/webhook-manifest.yaml
@@ -28,7 +28,7 @@ webhooks:
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  name: validating-webhook-configuration
+  name: fission-validating-webhooks
 webhooks:
 - admissionReviewVersions:
   - v1