[bitnami/jaeger] Chart missing imagePullSecrets and otlp ports (#20544)

* fix jaeger image pull secrets and otlp ports

Signed-off-by: Celizic, Fran AVL HR <fran.celizic@avl.com>

* update readme

Signed-off-by: Celizic, Fran AVL HR <fran.celizic@avl.com>

* update version to 1.4.4

Signed-off-by: Celizic, Fran AVL HR <fran.celizic@avl.com>

* Bump minor version

Signed-off-by: Miguel Ruiz <miruiz@vmware.com>

Signed-off-by: Miguel Ruiz <miruiz@vmware.com>

---------

Signed-off-by: Celizic, Fran AVL HR <fran.celizic@avl.com>
Signed-off-by: Miguel Ruiz <miruiz@vmware.com>
Co-authored-by: Celizic, Fran AVL HR <fran.celizic@avl.com>
Co-authored-by: Miguel Ruiz <miruiz@vmware.com>
This commit is contained in:
avl-team-pandas
2023-11-17 12:37:59 +01:00
committed by GitHub
parent 15910c2048
commit a8ebf5d42c
9 changed files with 65 additions and 1 deletions

View File

@@ -34,4 +34,4 @@ maintainers:
name: jaeger
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/jaeger
version: 1.4.3
version: 1.5.0

View File

@@ -210,15 +210,21 @@ The command removes all the Kubernetes components associated with the chart and
| `collector.containerPorts.grpc` | used by jaeger-agent to send spans in model.proto format | `14250` |
| `collector.containerPorts.binary` | can accept spans directly from clients in jaeger.thrift format over binary thrift protocol | `14268` |
| `collector.containerPorts.admin` | Admin port: health check at / and metrics at /metrics | `14269` |
| `collector.containerPorts.otlp.grpc` | Accepts traces in OpenTelemetry OTLP format over gRPC | `4317` |
| `collector.containerPorts.otlp.http` | Accepts traces in OpenTelemetry OTLP format over HTTP | `4318` |
| `collector.service.type` | Jaeger service type | `ClusterIP` |
| `collector.service.ports.zipkin` | can accept Zipkin spans in Thrift, JSON and Proto (disabled by default) | `9411` |
| `collector.service.ports.grpc` | used by jaeger-agent to send spans in model.proto format | `14250` |
| `collector.service.ports.binary` | can accept spans directly from clients in jaeger.thrift format over binary thrift protocol | `14268` |
| `collector.service.ports.admin` | Admin port: health check at / and metrics at /metrics | `14269` |
| `collector.service.ports.otlp.grpc` | Accepts traces in OpenTelemetry OTLP format over gRPC | `4317` |
| `collector.service.ports.otlp.http` | Accepts traces in OpenTelemetry OTLP format over HTTP | `4318` |
| `collector.service.nodePorts.zipkin` | can accept Zipkin spans in Thrift, JSON and Proto (disabled by default) | `""` |
| `collector.service.nodePorts.grpc` | used by jaeger-agent to send spans in model.proto format | `""` |
| `collector.service.nodePorts.binary` | can accept spans directly from clients in jaeger.thrift format over binary thrift protocol | `""` |
| `collector.service.nodePorts.admin` | Admin port: health check at / and metrics at /metrics | `""` |
| `collector.service.nodePorts.otlp.grpc` | Accepts traces in OpenTelemetry OTLP format over gRPC | `""` |
| `collector.service.nodePorts.otlp.http` | Accepts traces in OpenTelemetry OTLP format over HTTP | `""` |
| `collector.service.extraPorts` | Extra ports to expose in the service (normally used with the `sidecar` value) | `[]` |
| `collector.service.loadBalancerIP` | LoadBalancerIP if service type is `LoadBalancer` | `""` |
| `collector.service.loadBalancerSourceRanges` | Service Load Balancer sources | `[]` |

View File

@@ -28,6 +28,13 @@ Create the name of the query deployment
{{ printf "%s-query" (include "common.names.fullname" .) }}
{{- end -}}
{{/*
Return the proper Docker Image Registry Secret Names
*/}}
{{- define "jaeger.imagePullSecrets" -}}
{{ include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.cqlshImage) "global" .Values.global) }}
{{- end -}}
{{/*
Create a container for checking cassandra availability
*/}}

View File

@@ -31,6 +31,7 @@ spec:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.agent.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "jaeger.imagePullSecrets" . | nindent 6 }}
{{- if .Values.agent.schedulerName }}
schedulerName: {{ .Values.agent.schedulerName }}
{{- end }}

View File

@@ -31,6 +31,7 @@ spec:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.collector.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "jaeger.imagePullSecrets" . | nindent 6 }}
{{- if .Values.collector.schedulerName }}
schedulerName: {{ .Values.collector.schedulerName }}
{{- end }}
@@ -115,6 +116,10 @@ spec:
value: {{ printf ":%v" .Values.collector.containerPorts.grpc | quote }}
- name: COLLECTOR_HTTP_SERVER_HOST_PORT
value: {{ printf ":%v" .Values.collector.containerPorts.binary | quote }}
- name: COLLECTOR_OTLP_GRPC_HOST_PORT
value: {{ printf ":%v" .Values.collector.containerPorts.otlp.grpc | quote }}
- name: COLLECTOR_OTLP_HTTP_HOST_PORT
value: {{ printf ":%v" .Values.collector.containerPorts.otlp.http | quote }}
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" .Values.image.debug | quote }}
{{- if .Values.collector.extraEnvVars }}

View File

@@ -68,6 +68,22 @@ spec:
{{- else if eq .Values.collector.service.type "ClusterIP" }}
nodePort: null
{{- end }}
- name: otlp-grpc
port: {{ .Values.collector.service.ports.otlp.grpc }}
targetPort: {{ .Values.collector.containerPorts.otlp.grpc }}
{{- if and (or (eq .Values.collector.service.type "NodePort") (eq .Values.collector.service.type "LoadBalancer")) (not (empty .Values.collector.service.nodePorts.otlp.grpc)) }}
nodePort: {{ .Values.collector.service.nodePorts.otlp.grpc }}
{{- else if eq .Values.collector.service.type "ClusterIP" }}
nodePort: null
{{- end }}
- name: otlp-http
port: {{ .Values.collector.service.ports.otlp.http }}
targetPort: {{ .Values.collector.containerPorts.otlp.http }}
{{- if and (or (eq .Values.collector.service.type "NodePort") (eq .Values.collector.service.type "LoadBalancer")) (not (empty .Values.collector.service.nodePorts.otlp.http)) }}
nodePort: {{ .Values.collector.service.nodePorts.otlp.http }}
{{- else if eq .Values.collector.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- if .Values.collector.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.collector.service.extraPorts "context" $) | nindent 4 }}
{{- end }}

View File

@@ -25,6 +25,7 @@ spec:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.migration.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "jaeger.imagePullSecrets" . | nindent 6 }}
restartPolicy: OnFailure
{{- if .Values.migration.podSecurityContext.enabled }}
securityContext: {{- omit .Values.migration.podSecurityContext "enabled" | toYaml | nindent 8 }}

View File

@@ -31,6 +31,7 @@ spec:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.query.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "jaeger.imagePullSecrets" . | nindent 6 }}
{{- if .Values.query.schedulerName }}
schedulerName: {{ .Values.query.schedulerName }}
{{- end }}

View File

@@ -522,6 +522,15 @@ collector:
## @param collector.containerPorts.admin Admin port: health check at / and metrics at /metrics
##
admin: 14269
## Otlp ports to expose
##
otlp:
## @param collector.containerPorts.otlp.grpc Accepts traces in OpenTelemetry OTLP format over gRPC
##
grpc: 4317
## @param collector.containerPorts.otlp.http Accepts traces in OpenTelemetry OTLP format over HTTP
##
http: 4318
## Jaeger collector.service parameters
##
service:
@@ -543,6 +552,15 @@ collector:
## @param collector.service.ports.admin Admin port: health check at / and metrics at /metrics
##
admin: 14269
## Otlp ports to expose
##
otlp:
## @param collector.service.ports.otlp.grpc Accepts traces in OpenTelemetry OTLP format over gRPC
##
grpc: 4317
## @param collector.service.ports.otlp.http Accepts traces in OpenTelemetry OTLP format over HTTP
##
http: 4318
## Node ports to expose
## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
nodePorts:
@@ -558,6 +576,15 @@ collector:
## @param collector.service.nodePorts.admin Admin port: health check at / and metrics at /metrics
##
admin: ""
## Otlp ports to expose
##
otlp:
## @param collector.service.nodePorts.otlp.grpc Accepts traces in OpenTelemetry OTLP format over gRPC
##
grpc: ""
## @param collector.service.nodePorts.otlp.http Accepts traces in OpenTelemetry OTLP format over HTTP
##
http: ""
## @param collector.service.extraPorts Extra ports to expose in the service (normally used with the `sidecar` value)
##
extraPorts: []