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

[jaeger] Add configurable OLTP port names in jaeger collector services #478

Merged
merged 7 commits into from
Jun 21, 2023
Merged

[jaeger] Add configurable OLTP port names in jaeger collector services #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c382bc3
Add proto prefix to port names in services
cnvergence Jun 12, 2023
d24056f
Bump chart version
cnvergence Jun 12, 2023
62954d3
Refactor PR to allow only to configure OTLP port names
cnvergence Jun 20, 2023
8041d2c
Restore other port names
cnvergence Jun 20, 2023
d881cf3
fix lint
cnvergence Jun 20, 2023
878c1c4
Update charts/jaeger/values.yaml
cnvergence Jun 20, 2023
6e8ae31
fix values.yaml
cnvergence Jun 21, 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
2 changes: 1 addition & 1 deletion charts/jaeger/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 1.45.0
description: A Jaeger Helm chart for Kubernetes
name: jaeger
type: application
version: 0.71.4
version: 0.71.5
# CronJobs require v1.21
kubeVersion: '>= 1.21-0'
keywords:
Expand Down
4 changes: 2 additions & 2 deletions charts/jaeger/templates/allinone-collector-svc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ spec:
- name: http-c-binary-trft
port: 14268
targetPort: 0
- name: otlp-grpc
- name: {{ .Values.allInOne.service.collector.otlp.grpc.name }}
port: 4317
targetPort: 0
- name: otlp-http
- name: {{ .Values.allInOne.service.collector.otlp.http.name }}
port: 4318
targetPort: 0
selector:
Expand Down
8 changes: 4 additions & 4 deletions charts/jaeger/templates/collector-svc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ spec:
targetPort: zipkin
{{- end }}
{{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
- name: otlp-grpc
- name: {{ .Values.collector.service.otlp.grpc.name }}
port: {{ default 4317 .Values.collector.service.otlp.grpc.port }}
{{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.otlp.grpc.nodePort) }}
nodePort: {{ .Values.collector.service.otlp.grpc.nodePort }}
{{- end }}
protocol: TCP
targetPort: otlp-grpc
- name: otlp-http
targetPort: {{ .Values.collector.service.otlp.grpc.name }}
- name: {{ .Values.collector.service.otlp.http.name }}
port: {{ default 4318 .Values.collector.service.otlp.http.port }}
{{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.otlp.http.nodePort) }}
nodePort: {{ .Values.collector.service.otlp.http.nodePort }}
{{- end }}
protocol: TCP
targetPort: otlp-http
targetPort: {{ .Values.collector.service.otlp.http.name }}
{{- end }}
- name: admin
port: 14269
Expand Down
12 changes: 10 additions & 2 deletions charts/jaeger/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ allInOne:
# }
service:
headless: true
collector:
otlp:
grpc:
name: gtpc-otlp
http:
name: http-otlp
ingress:
enabled: false
# For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
Expand Down Expand Up @@ -372,10 +378,12 @@ collector:
# port: 9411
# nodePort:
otlp:
grpc: {}
grpc:
name: grpc-otlp
# port: 4317
# nodePort:
http: {}
http:
name: http-otlp
# port: 4318
# nodePort:
ingress:
Expand Down