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

Jump to bottom

dev to kube-1.16 #3028

Closed
wants to merge 6 commits into from
Closed

dev to kube-1.16 #3028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c392ddd
Add support listener port to skipper-ingress service
mikkeloscar Jan 9, 2020
89f664d
Merge pull request #2849 from zalando-incubator/skipper-ingress-svc-s…
mikkeloscar Feb 25, 2020
da63320
Split skipper lightstep config over multiple lines
mikkeloscar Feb 25, 2020
886bdfe
Merge pull request #3026 from zalando-incubator/skipper-multiline
szuecs Feb 26, 2020
07ee7fb
Merge pull request #2774 from zalando-incubator/kube-1.16
mikkeloscar Feb 26, 2020
1a5d835
Merge dev to dev-to-kube-1.16
zalando-teapot-robot Feb 26, 2020
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
16 changes: 15 additions & 1 deletion cluster/manifests/skipper/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,21 @@ spec:
{{ end }}
- "-oauth2-tokeninfo-url={{ .ConfigItems.tokeninfo_url }}"
- "-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"
- "-opentracing=lightstep component-name=skipper-ingress token=$(LIGHTSTEP_TOKEN) collector=tracing.stups.zalan.do:8444 cmd-line=skipper-ingress max-buffered-spans={{ .ConfigItems.skipper_ingress_tracing_buffer }} tag=application=skipper-ingress tag=account={{ .Cluster.Alias }} tag=cluster={{ .Cluster.Alias }} tag=artifact=registry.opensource.zalan.do/pathfinder/skipper:v0.11.48 grpc-max-msg-size={{ .ConfigItems.skipper_ingress_lightstep_grpc_max_msg_size }} max-period={{ .ConfigItems.skipper_ingress_lightstep_max_period }} min-period={{ .ConfigItems.skipper_ingress_lightstep_min_period }} {{ .Cluster.ConfigItems.skipper_ingress_lightstep_log_events }}"
- >-
-opentracing=lightstep
component-name=skipper-ingress
token=$(LIGHTSTEP_TOKEN)
collector=tracing.stups.zalan.do:8444
cmd-line=skipper-ingress
max-buffered-spans={{ .ConfigItems.skipper_ingress_tracing_buffer }}
tag=application=skipper-ingress
tag=account={{ .Cluster.Alias }}
tag=cluster={{ .Cluster.Alias }}
tag=artifact=registry.opensource.zalan.do/pathfinder/skipper:v0.11.48
grpc-max-msg-size={{ .ConfigItems.skipper_ingress_lightstep_grpc_max_msg_size }}
max-period={{ .ConfigItems.skipper_ingress_lightstep_max_period }}
min-period={{ .ConfigItems.skipper_ingress_lightstep_min_period }}
{{ .Cluster.ConfigItems.skipper_ingress_lightstep_log_events }}
- "-opentracing-excluded-proxy-tags={{ .ConfigItems.skipper_ingress_opentracing_excluded_proxy_tags }}"
- "-expect-continue-timeout-backend={{ .ConfigItems.skipper_expect_continue_timeout_backend }}"
- "-keepalive-backend={{ .ConfigItems.skipper_keepalive_backend }}"
Expand Down
11 changes: 8 additions & 3 deletions cluster/manifests/skipper/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ metadata:
spec:
type: ClusterIP
ports:
- port: 80
targetPort: 9999
protocol: TCP
- name: http
port: 80
targetPort: 9999
protocol: TCP
- name: support
port: 9911
targetPort: 9911
protocol: TCP
selector:
application: skipper-ingress