Merge pull request #3109 from lowang-bh/helmGenYaml

fix update-development-yaml will remove more webhooks than disabled one
volcano-sh · Jan 18, 2024 · 0b05bb7 · 0b05bb7
2 parents b77067e + f9351f3
commit 0b05bb7
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/installer/helm/chart/volcano/templates/webhooks.yaml b/installer/helm/chart/volcano/templates/webhooks.yaml
@@ -43,9 +43,8 @@ webhooks:
     timeoutSeconds: 10
 {{- end }}
 
----
-
 {{- if .Values.custom.enabled_admissions | regexMatch "/queues/mutate" }}
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
@@ -88,9 +87,9 @@ webhooks:
     timeoutSeconds: 10
 {{- end }}
 
----
 
 {{- if .Values.custom.enabled_admissions | regexMatch "/podgroups/mutate" }}
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
@@ -133,9 +132,9 @@ webhooks:
     timeoutSeconds: 10
 {{- end }}
 
----
 
 {{- if .Values.custom.enabled_admissions | regexMatch "/jobs/mutate" }}
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
@@ -178,9 +177,9 @@ webhooks:
     timeoutSeconds: 10
 {{- end }}
 
----
 
 {{- if .Values.custom.enabled_admissions | regexMatch "/jobs/validate" }}
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
@@ -223,9 +222,9 @@ webhooks:
     timeoutSeconds: 10
 {{- end }}
 
----
 
 {{- if .Values.custom.enabled_admissions | regexMatch "/pods/validate" }}
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
@@ -267,9 +266,9 @@ webhooks:
     timeoutSeconds: 10
 {{- end }}
 
----
 
 {{- if .Values.custom.enabled_admissions | regexMatch "/queues/validate" }}
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata: