Skip to content

Commit e33202a

Browse files
Merge pull request #9479 from zalando-incubator/admission-control/enable-ingress-routegroup
admission-control: enable ingress and routegroup admission
2 parents 9ed93f7 + 3d2eaad commit e33202a

File tree

2 files changed

+43
-1
lines changed

2 files changed

+43
-1
lines changed

cluster/config-defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ enable_statefulset_autodelete_pvc: "true"
11291129
# Source for the template function: sgIngressRanges: https://github.com/zalando-incubator/cluster-lifecycle-manager/blob/42695865a251fef58e22ce612d6549e75fa5d103/provisioner/template.go#L336-L417
11301130
open_sg_ingress_ranges: ""
11311131

1132-
# Each subdomain can reach a max of 63 bytes on Route53
1132+
# Each DNS label (subdomain) can be 63 octets or less (https://datatracker.ietf.org/doc/html/rfc1035#section-2.3.4)
11331133
# This custom value sets the subdomain max allowed length taking into consideration the 'cname-' prefix added by external-dns
11341134
subdomain_max_length: "57"
11351135

cluster/manifests/02-admission-control/teapot.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,48 @@ webhooks:
475475
apiGroups: [""]
476476
apiVersions: ["v1"]
477477
resources: ["services"]
478+
479+
- name: ingress-admitter.teapot.zalan.do
480+
clientConfig:
481+
{{- if eq .Cluster.Provider "zalando-eks"}}
482+
service:
483+
name: "admission-controller"
484+
namespace: "kube-system"
485+
path: "/ingress"
486+
{{- else }}
487+
url: "https://localhost:8085/ingress"
488+
{{- end }}
489+
caBundle: "{{ .Cluster.ConfigItems.ca_cert_decompressed }}"
490+
admissionReviewVersions: ["v1beta1"]
491+
failurePolicy: Fail
492+
sideEffects: "NoneOnDryRun"
493+
matchPolicy: Equivalent
494+
rules:
495+
- operations: [ "CREATE", "UPDATE" ]
496+
apiGroups: ["networking.k8s.io"]
497+
apiVersions: ["v1"]
498+
resources: ["ingresses"]
499+
- name: routegroup-admitter.teapot.zalan.do
500+
clientConfig:
501+
{{- if eq .Cluster.Provider "zalando-eks"}}
502+
service:
503+
name: "admission-controller"
504+
namespace: "kube-system"
505+
path: "/routegroup"
506+
{{- else }}
507+
url: "https://localhost:8085/routegroup"
508+
{{- end }}
509+
caBundle: "{{ .Cluster.ConfigItems.ca_cert_decompressed }}"
510+
admissionReviewVersions: ["v1beta1"]
511+
failurePolicy: Fail
512+
sideEffects: "NoneOnDryRun"
513+
matchPolicy: Equivalent
514+
rules:
515+
- operations: [ "CREATE", "UPDATE" ]
516+
apiGroups: ["zalando.org"]
517+
apiVersions: ["v1"]
518+
resources: ["routegroups"]
519+
478520
{{- if eq .Cluster.ConfigItems.teapot_admission_controller_enable_rolebinding_webhook "true" }}
479521
- name: rolebinding-admitter.teapot.zalan.do
480522
{{- if eq .Cluster.Provider "zalando-eks"}}

0 commit comments

Comments
 (0)