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

Add missing maps webhook, fix inconsistencies #6489

Merged
merged 4 commits into from
Mar 6, 2023
Merged

Add missing maps webhook, fix inconsistencies #6489

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b0a055
Add missing maps webhook, fix inconsistencies, remove static wh mani…
pebrc Mar 6, 2023
014bd69
Re-add manifest it is apparently generated by manifest gen
pebrc Mar 6, 2023
2a349fb
Fix addmissionReviewVersions for webhook annotation
pebrc Mar 6, 2023
57895a8
re-generate webhooks
pebrc Mar 6, 2023
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
51 changes: 40 additions & 11 deletions deploy/eck-operator/templates/webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ webhooks:
{{- end }}
name: elastic-agent-validation-v1alpha1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -57,7 +57,7 @@ webhooks:
{{- end }}
name: elastic-apm-validation-v1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -86,7 +86,7 @@ webhooks:
{{- end }}
name: elastic-apm-validation-v1beta1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -115,7 +115,7 @@ webhooks:
{{- end }}
name: elastic-beat-validation-v1beta1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -144,7 +144,7 @@ webhooks:
{{- end }}
name: elastic-ent-validation-v1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -173,7 +173,7 @@ webhooks:
{{- end }}
name: elastic-ent-validation-v1beta1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -202,7 +202,7 @@ webhooks:
{{- end }}
name: elastic-es-validation-v1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -231,7 +231,7 @@ webhooks:
{{- end }}
name: elastic-es-validation-v1beta1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand All @@ -243,6 +243,35 @@ webhooks:
- UPDATE
resources:
- elasticsearches
- clientConfig:
caBundle: {{ .Values.webhook.caBundle }}
service:
name: {{ include "eck-operator.webhookServiceName" . }}
namespace: {{ .Release.Namespace }}
path: /validate-ems-k8s-elastic-co-v1alpha1-mapsservers
failurePolicy: {{ .Values.webhook.failurePolicy }}
{{- with .Values.webhook.namespaceSelector }}
namespaceSelector:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.webhook.objectSelector }}
objectSelector:
{{- toYaml . | nindent 4 }}
{{- end }}
name: elastic-ems-validation-v1alpha1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
- maps.k8s.elastic.co
apiVersions:
- v1alpha1
operations:
- CREATE
- UPDATE
resources:
- mapsservers
- clientConfig:
caBundle: {{ .Values.webhook.caBundle }}
service:
Expand All @@ -260,7 +289,7 @@ webhooks:
{{- end }}
name: elastic-kb-validation-v1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -289,7 +318,7 @@ webhooks:
{{- end }}
name: elastic-kb-validation-v1beta1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down Expand Up @@ -318,7 +347,7 @@ webhooks:
{{- end }}
name: elastic-esa-validation-v1alpha1.k8s.elastic.co
matchPolicy: Exact
admissionReviewVersions: [v1beta1]
admissionReviewVersions: [v1,v1beta1]
sideEffects: None
rules:
- apiGroups:
Expand Down