Skip to content

Commit a4a251f

Browse files
committed
enabled missing configuration for custom filters
- OAuth2 Tokeninfo Filters - OAuth2 Grant Flow - Open Policy Agent - Rate Limiter - Compression
1 parent 248b521 commit a4a251f

File tree

1 file changed

+155
-0
lines changed

1 file changed

+155
-0
lines changed

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

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,54 @@ spec:
5353
containers:
5454
- name: skipper-admission-webhook
5555
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.142
56+
env:
57+
- name: LIGHTSTEP_TOKEN
58+
valueFrom:
59+
secretKeyRef:
60+
name: skipper-ingress
61+
key: lightstep-token
62+
{{ if or (eq .Cluster.ConfigItems.skipper_local_tokeninfo "production") (eq .Cluster.ConfigItems.skipper_local_tokeninfo "bridge") }}
63+
- name: LOCAL_TOKENINFO
64+
value: "true"
65+
- name: ENABLE_OPENTRACING
66+
value: "true"
67+
- name: OPENTRACING_LIGHTSTEP_COMPONENT_NAME
68+
value: "tokeninfo-skipper-ingress"
69+
- name: OPENTRACING_LIGHTSTEP_ACCESS_TOKEN
70+
valueFrom:
71+
secretKeyRef:
72+
name: skipper-ingress
73+
key: lightstep-token
74+
{{ end }}
75+
{{ if eq .Cluster.ConfigItems.skipper_local_tokeninfo "bridge" }}
76+
- name: LOCAL_TOKENINFO_SANDBOX
77+
value: "true"
78+
{{ end }}
79+
{{ if or (eq .Cluster.ConfigItems.nlb_switch "pre") (eq .Cluster.ConfigItems.nlb_switch "exec") }}
80+
- name: HTTP_REDIRECT
81+
value: "true"
82+
{{ end }}
83+
{{ if eq .Cluster.ConfigItems.skipper_lua_scripts_enabled "true" }}
84+
- name: LUA_PATH
85+
value: /etc/skipper/lua/?.lua
86+
- name: DATADOME_API_KEY
87+
valueFrom:
88+
secretKeyRef:
89+
name: skipper-ingress
90+
key: datadome-api-key
91+
- name: KASADA_API_KEY
92+
valueFrom:
93+
secretKeyRef:
94+
name: skipper-ingress
95+
key: kasada-api-key
96+
{{ end }}
97+
{{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_enabled "true" }}
98+
- name: STYRA_TOKEN
99+
valueFrom:
100+
secretKeyRef:
101+
name: skipper-ingress
102+
key: styra-token
103+
{{ end }}
56104
args:
57105
- skipper
58106
- -support-listener=:9981
@@ -73,6 +121,22 @@ spec:
73121
- "-disable-metrics-compat"
74122
- "-histogram-metric-buckets=.0001,.00025,.0005,.00075,.001,.0025,.005,.0075,.01,.025,.05,.075,.1,.2,.3,.4,.5,.75,1,2,3,4,5,7,10,15,20,30,60,120,300,600"
75123
- "-disabled-filters={{ .Cluster.ConfigItems.skipper_disabled_filters }}"
124+
- "-compress-encodings={{ .Cluster.ConfigItems.skipper_compress_encodings }}"
125+
- "-enable-ratelimits"
126+
{{ if eq .Cluster.ConfigItems.skipper_ingress_redis_swarm_enabled "true" }}
127+
- "-enable-swarm"
128+
- "-swarm-redis-dial-timeout={{ .Cluster.ConfigItems.skipper_redis_dial_timeout }}"
129+
- "-swarm-redis-pool-timeout={{ .Cluster.ConfigItems.skipper_redis_pool_timeout }}"
130+
- "-swarm-redis-read-timeout={{ .Cluster.ConfigItems.skipper_redis_read_timeout }}"
131+
- "-swarm-redis-write-timeout={{ .Cluster.ConfigItems.skipper_redis_write_timeout }}"
132+
- "-cluster-ratelimit-max-group-shards={{ .Cluster.ConfigItems.skipper_cluster_ratelimit_max_group_shards }}"
133+
- "-swarm-redis-min-conns={{ .Cluster.ConfigItems.skipper_redis_min_conns }}"
134+
- "-swarm-redis-max-conns={{ .Cluster.ConfigItems.skipper_redis_max_conns }}"
135+
- "-kubernetes-redis-service-namespace=kube-system"
136+
- "-kubernetes-redis-service-name=skipper-ingress-redis"
137+
- "-kubernetes-redis-service-port=6379"
138+
{{ end }}
139+
- "-lua-sources={{ .Cluster.ConfigItems.skipper_lua_sources }}"
76140
- "-default-filters-dir=/etc/config/default-filters"
77141
- '-default-filters-prepend={{ .Cluster.ConfigItems.skipper_default_filters }}'
78142
- '-default-filters-append={{ .Cluster.ConfigItems.skipper_default_filters_authentication }}'
@@ -81,6 +145,60 @@ spec:
81145
- '-kubernetes-annotation-filters-append={{ .Cluster.ConfigItems.skipper_kubernetes_annotation_filters_append }}'
82146
- '-kubernetes-east-west-range-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_predicates }}'
83147
- '-kubernetes-east-west-range-annotation-filters-append={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_filters_append }}'
148+
{{ if eq .Cluster.ConfigItems.skipper_local_tokeninfo "bridge" }}
149+
- "-oauth2-tokeninfo-url=http://127.0.0.1:9000/oauth2/tokeninfo"
150+
- "-status-checks=http://127.0.0.1:9021/health,http://127.0.0.1:9121/health,http://127.0.0.1:9000/healthz"
151+
{{ else if eq .Cluster.ConfigItems.skipper_local_tokeninfo "production" }}
152+
- "-oauth2-tokeninfo-url=http://127.0.0.1:9021/oauth2/tokeninfo"
153+
- "-status-checks=http://127.0.0.1:9021/health"
154+
{{ end }}
155+
- "-oauth2-tokeninfo-cache-size={{ .Cluster.ConfigItems.skipper_tokeninfo_cache_size }}"
156+
- "-oauth2-tokeninfo-cache-ttl={{ .Cluster.ConfigItems.skipper_tokeninfo_cache_ttl }}"
157+
{{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
158+
- "-enable-oauth2-grant-flow"
159+
- "-oauth2-auth-url={{ .Cluster.ConfigItems.skipper_oauth2_auth_url }}"
160+
- "-oauth2-token-url={{ .Cluster.ConfigItems.skipper_oauth2_token_url }}"
161+
- "-oauth2-secret-file=/etc/skipper/secret/encryption-key"
162+
- "-oauth2-client-id-file=/etc/skipper/hostname-credentials/{host}-grant-credentials-employee-client-id"
163+
- "-oauth2-client-secret-file=/etc/skipper/hostname-credentials/{host}-grant-credentials-employee-client-secret"
164+
- "-credentials-update-interval=1m"
165+
- "-oauth2-token-cookie-name={{ .Cluster.ConfigItems.skipper_oauth2_cookie_name }}"
166+
- "-oauth2-token-cookie-remove-subdomains=0"
167+
- "-oauth2-callback-path={{ .Cluster.ConfigItems.skipper_oauth2_redirect_uri_path }}"
168+
- "-oauth2-grant-tokeninfo-keys={{ .Cluster.ConfigItems.skipper_oauth2_ui_login_tokeninfo_keys }}"
169+
{{ end }}
170+
{{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_enabled "true" }}
171+
- "-enable-open-policy-agent"
172+
- "-open-policy-agent-config-template=/etc/skipper/open-policy-agent/opaconfig.yaml"
173+
- "-open-policy-agent-envoy-metadata=/etc/skipper/open-policy-agent/envoymetadata.json"
174+
- "-enable-open-policy-agent-data-preprocessing-optimization={{ .Cluster.ConfigItems.skipper_open_policy_agent_data_preprocessing_optimization_enabled }}"
175+
- "-enable-open-policy-agent-preloading={{ .Cluster.ConfigItems.skipper_open_policy_agent_preloading_enabled }}"
176+
{{ end }}
177+
- >-
178+
-opentracing=lightstep
179+
component-name=skipper-validation-webhook
180+
token=$(LIGHTSTEP_TOKEN)
181+
collector={{ .Cluster.ConfigItems.tracing_collector_host }}:8444
182+
cmd-line=skipper-validation-webhook
183+
tag=application=skipper-ingress
184+
tag=component=webhook
185+
tag=account={{ .Cluster.Alias }}
186+
tag=cluster={{ .Cluster.Alias }}
187+
tag=artifact=926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.142
188+
max-buffered-spans={{ .Cluster.ConfigItems.skipper_ingress_tracing_buffer }}
189+
grpc-max-msg-size={{ .Cluster.ConfigItems.skipper_ingress_lightstep_grpc_max_msg_size }}
190+
max-period={{ .Cluster.ConfigItems.skipper_ingress_lightstep_max_period }}
191+
min-period={{ .Cluster.ConfigItems.skipper_ingress_lightstep_min_period }}
192+
max-log-key-len={{ .Cluster.ConfigItems.skipper_ingress_lightstep_max_log_key_len }}
193+
max-log-value-len={{ .Cluster.ConfigItems.skipper_ingress_lightstep_max_log_value_len }}
194+
max-logs-per-span={{ .Cluster.ConfigItems.skipper_ingress_lightstep_max_logs_per_span }}
195+
propagators={{ .Cluster.ConfigItems.skipper_ingress_lightstep_propagators }}
196+
{{ .Cluster.ConfigItems.skipper_ingress_lightstep_log_events }}
197+
- "-opentracing-excluded-proxy-tags={{ .Cluster.ConfigItems.skipper_ingress_opentracing_excluded_proxy_tags }}"
198+
{{ if eq .Cluster.ConfigItems.skipper_ingress_opentracing_backend_name_tag "true" }}
199+
- "-opentracing-backend-name-tag"
200+
{{ end }}
201+
- "-opentracing-disable-filter-spans={{ .Cluster.ConfigItems.skipper_opentracing_disable_filter_spans }}"
84202
lifecycle:
85203
preStop:
86204
sleep:
@@ -110,6 +228,24 @@ spec:
110228
readOnly: true
111229
- name: filters
112230
mountPath: /etc/config/default-filters
231+
{{ if eq .Cluster.ConfigItems.skipper_lua_scripts_enabled "true" }}
232+
- name: lua
233+
mountPath: /etc/skipper/lua
234+
readOnly: true
235+
{{ end }}
236+
{{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true"}}
237+
- name: hostname-credentials
238+
mountPath: /etc/skipper/hostname-credentials
239+
readOnly: true
240+
- name: encryption-key
241+
mountPath: /etc/skipper/secret
242+
readOnly: true
243+
{{ end }}
244+
{{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_enabled "true" }}
245+
- name: open-policy-agent-config
246+
mountPath: /etc/skipper/open-policy-agent
247+
readOnly: true
248+
{{ end }}
113249
volumes:
114250
- name: tls-certs
115251
secret:
@@ -118,3 +254,22 @@ spec:
118254
configMap:
119255
name: skipper-default-filters
120256
optional: true
257+
{{ if eq .Cluster.ConfigItems.skipper_lua_scripts_enabled "true" }}
258+
- name: lua
259+
configMap:
260+
name: skipper-ingress-lua
261+
optional: true
262+
{{ end }}
263+
{{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true"}}
264+
- name: hostname-credentials
265+
secret:
266+
secretName: hostname-credentials
267+
- name: encryption-key
268+
secret:
269+
secretName: skipper-ingress
270+
{{ end }}
271+
{{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_enabled "true" }}
272+
- name: open-policy-agent-config
273+
configMap:
274+
name: open-policy-agent-config
275+
{{ end }}

0 commit comments

Comments
 (0)