Skip to content

Commit 11f92c6

Browse files
authored
Merge pull request #10059 from zalando-incubator/enable-new-validation
validation: migrate to skipper binary
2 parents 9d37233 + 1540f66 commit 11f92c6

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

cluster/config-defaults.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ routegroups_validation: "enabled"
342342
# disabled|enabled ingress validation via skipper webhook
343343
ingresses_validation: "enabled"
344344

345+
enable_advanced_validation: "false"
346+
345347
# tokeninfo
346348
{{if eq .Cluster.Environment "production"}}
347349
# production|bridge|disabled

cluster/manifests/02-skipper-validation-webhook/deployment.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if eq .Cluster.Provider "zalando-eks"}}
1+
# {{- if eq .Cluster.Provider "zalando-eks"}}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
@@ -30,10 +30,12 @@ spec:
3030
- name: skipper-admission-webhook
3131
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.142
3232
args:
33-
- webhook
34-
- --address=:9085
35-
- --tls-cert-file=/etc/tls-certs/skipper-validation-webhook.pem
36-
- --tls-key-file=/etc/tls-certs/skipper-validation-webhook-key.pem
33+
- skipper
34+
- --validation-webhook-enabled=true
35+
- --validation-webhook-address=:9085
36+
- --validation-webhook-cert-file=/etc/tls-certs/skipper-validation-webhook.pem
37+
- --validation-webhook-key-file=/etc/tls-certs/skipper-validation-webhook-key.pem
38+
- "--enable-advanced-validation={{ .Cluster.ConfigItems.enable_advanced_validation }}"
3739
lifecycle:
3840
preStop:
3941
sleep:
@@ -59,4 +61,4 @@ spec:
5961
- name: tls-certs
6062
secret:
6163
secretName: skipper-validation-webhook-tls-certs
62-
{{- end }}
64+
# {{- end }}

cluster/node-pools/master-default/userdata.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,14 @@ write_files:
260260
name: admission-controller-kubeconfig
261261
readOnly: true
262262
- name: skipper-admission-webhook
263-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.127
263+
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.142
264264
args:
265-
- webhook
266-
- --address=:9085
267-
- --tls-cert-file=/etc/kubernetes/ssl/admission-controller.pem
268-
- --tls-key-file=/etc/kubernetes/ssl/admission-controller-key.pem
265+
- skipper
266+
- --validation-webhook-enabled=true
267+
- --validation-webhook-address=:9085
268+
- --validation-webhook-cert-file=/etc/kubernetes/ssl/admission-controller.pem
269+
- --validation-webhook-key-file=/etc/kubernetes/ssl/admission-controller-key.pem
270+
- "--enable-advanced-validation={{ .Cluster.ConfigItems.enable_advanced_validation }}"
269271
lifecycle:
270272
preStop:
271273
sleep:

0 commit comments

Comments
 (0)