Skip to content

Commit b9c16d7

Browse files
committed
scaffold: fix webhookconfiguration name to be more uniqe
1 parent 943431c commit b9c16d7

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

scaffold/templates/.local/resources/mutate.yaml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: MutatingWebhookConfiguration
55
metadata:
66
name: {{ (split "." .operatorName)._0 }}
77
webhooks:
8-
- name: {{ .operatorName }}
8+
- name: mutate.{{ .resource }}.{{ .groupName }}
99
admissionReviewVersions:
1010
- v1
1111
clientConfig:

scaffold/templates/.local/resources/validate.yaml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ValidatingWebhookConfiguration
55
metadata:
66
name: {{ (split "." .operatorName)._0 }}
77
webhooks:
8-
- name: {{ .operatorName }}
8+
- name: validate.{{ .resource }}.{{ .groupName }}
99
admissionReviewVersions:
1010
- v1
1111
clientConfig:

scaffold/templates/chart/templates/webhook.yaml.tpl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ metadata:
7777
cert-manager.io/inject-ca-from: {{`{{`}} .Release.Namespace {{`}}`}}/{{`{{`}} include "{{ $operator }}.fullname" . {{`}}`}}
7878
{{`{{`}}- end {{`}}`}}
7979
webhooks:
80-
- name: {{ .operatorName }}
80+
- name: validate.{{ .resource }}.{{ .groupName }}
8181
admissionReviewVersions:
8282
- v1
8383
clientConfig:
@@ -101,9 +101,10 @@ webhooks:
101101
resources:
102102
- {{ .resource }}
103103
scope: Namespaced
104-
failurePolicy: Fail
104+
matchPolicy: Equivalent
105105
sideEffects: None
106106
timeoutSeconds: 10
107+
failurePolicy: Fail
107108
{{- end }}
108109
{{- if .mutatingWebhookEnabled }}
109110
---
@@ -118,7 +119,7 @@ metadata:
118119
cert-manager.io/inject-ca-from: {{`{{`}} .Release.Namespace {{`}}`}}/{{`{{`}} include "{{ $operator }}.fullname" . {{`}}`}}
119120
{{`{{`}}- end {{`}}`}}
120121
webhooks:
121-
- name: {{ .operatorName }}
122+
- name: mutate.{{ .resource }}.{{ .groupName }}
122123
admissionReviewVersions:
123124
- v1
124125
clientConfig:
@@ -141,8 +142,9 @@ webhooks:
141142
resources:
142143
- {{ .resource }}
143144
scope: Namespaced
144-
failurePolicy: Fail
145+
matchPolicy: Equivalent
145146
sideEffects: None
146-
reinvocationPolicy: Never
147147
timeoutSeconds: 10
148+
failurePolicy: Fail
149+
reinvocationPolicy: Never
148150
{{- end }}

0 commit comments

Comments
 (0)