Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

In webhook add match condition by scheduler name filter pod resources #3748

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −5
Open

In webhook add match condition by scheduler name filter pod resources #3748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions installer/helm/chart/volcano/templates/webhooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.custom.admission_enable }}

{{ $scheduler_name := .Values.custom.scheduler_name | default "volcano" }}
{{- if .Values.custom.enabled_admissions | regexMatch "/pods/mutate" }}
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
Expand All @@ -18,7 +18,7 @@ webhooks:
namespace: {{ .Release.Namespace }}
path: /pods/mutate
port: 443
failurePolicy: Fail
failurePolicy: Ignore
lengrongfu marked this conversation as resolved.
Show resolved Hide resolved
matchPolicy: Equivalent
name: mutatepod.volcano.sh
namespaceSelector:
Expand All @@ -33,6 +33,9 @@ webhooks:
{{- end }}
objectSelector: {}
reinvocationPolicy: Never
matchConditions:
- expression: object.spec.schedulerName == '{{- $scheduler_name }}'
name: scheduler-name-match
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -262,7 +265,7 @@ webhooks:
namespace: {{ .Release.Namespace }}
path: /pods/validate
port: 443
failurePolicy: Fail
failurePolicy: Ignore
lengrongfu marked this conversation as resolved.
Show resolved Hide resolved
matchPolicy: Equivalent
name: validatepod.volcano.sh
namespaceSelector:
Expand All @@ -276,6 +279,9 @@ webhooks:
{{- toYaml .Values.custom.webhooks_namespace_selector_expressions | nindent 8 }}
{{- end }}
objectSelector: {}
matchConditions:
- expression: object.spec.schedulerName == '{{- $scheduler_name }}'
name: scheduler-name-match
rules:
- apiGroups:
- ""
Expand Down
10 changes: 8 additions & 2 deletions installer/volcano-development.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5032,7 +5032,7 @@ webhooks:
namespace: volcano-system
path: /pods/mutate
port: 443
failurePolicy: Fail
failurePolicy: Ignore
lengrongfu marked this conversation as resolved.
Show resolved Hide resolved
matchPolicy: Equivalent
name: mutatepod.volcano.sh
namespaceSelector:
Expand All @@ -5044,6 +5044,9 @@ webhooks:
- kube-system
objectSelector: {}
reinvocationPolicy: Never
matchConditions:
- expression: object.spec.schedulerName == 'volcano'
name: scheduler-name-match
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -5227,7 +5230,7 @@ webhooks:
namespace: volcano-system
path: /pods/validate
port: 443
failurePolicy: Fail
failurePolicy: Ignore
lengrongfu marked this conversation as resolved.
Show resolved Hide resolved
matchPolicy: Equivalent
name: validatepod.volcano.sh
namespaceSelector:
Expand All @@ -5238,6 +5241,9 @@ webhooks:
- volcano-system
- kube-system
objectSelector: {}
matchConditions:
- expression: object.spec.schedulerName == 'volcano'
name: scheduler-name-match
rules:
- apiGroups:
- ""
Expand Down
Loading