add ingress with no gateway

charts/tempo-distributed/README.md

@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
+![Version: 1.16.0](https://img.shields.io/badge/Version-1.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -543,6 +543,7 @@ The memcached default args are removed and should be provided manually. The sett
 | ingester.zoneAwareReplication.zones[2].extraAffinity | object | `{}` | extraAffinity adds user defined custom affinity rules (merged with generated rules) |
 | ingester.zoneAwareReplication.zones[2].nodeSelector | string | `nil` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector:   topology.kubernetes.io/zone: zone-c |
 | ingester.zoneAwareReplication.zones[2].storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: <storageClass> If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. |
+| ingress | object | `{"annotations":{},"enabled":false,"hosts":["tempo.example.com"],"paths":{"compactor":[{"path":"/api/v1/upload/block/"}],"distributor":[{"path":"/jaeger/api/traces"},{"path":"/zipkin/spans"},{"path":"/v1/traces"},{"path":"/otlp/v1/traces"},{"path":"/distributor/ring"},{"path":"/ingester/ring"}],"ingester":[{"path":"/flush"},{"path":"/shutdown"}],"query-frontend":[{"path":"/api"}]}}` | Use either this ingress or the gateway, but not both at once. If you enable this, make sure to disable the gateway's ingress. |
 | license.contents | string | `"NOTAVALIDLICENSE"` |  |
 | license.external | bool | `false` |  |
 | license.secretName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"license\") }}"` |  |

charts/tempo-distributed/templates/_helpers.tpl

@@ -184,6 +184,8 @@ Calculate the config from structured and unstructured text input
 {{ tpl (mergeOverwrite (tpl .Values.config . | fromYaml) .Values.tempo.structuredConfig | toYaml) . }}
 {{- end -}}
 
+
+
 {{/*
 Renders the overrides config
 */}}

charts/tempo-distributed/templates/ingress.yaml

@@ -1,12 +1,11 @@
 {{- if .Values.ingress.enabled }}
-{{ $dict := dict "ctx" . "component" "gateway"  }}
 {{- $ingressApiIsStable := eq (include "tempo.ingress.isStable" .) "true" -}}
 {{- $ingressSupportsIngressClassName := eq (include "tempo.ingress.supportsIngressClassName" .) "true" -}}
 {{- $ingressSupportsPathType := eq (include "tempo.ingress.supportsPathType" .) "true" -}}
 apiVersion: {{ include "tempo.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
-  name: {{ include "tempo.resourceName" $dict }}
+  name: {{ include "tempo.fullname" . }}
   labels:
     {{- include "tempo.labels" (dict "ctx" . "component" "gateway") | nindent 4 }}
     {{- with .Values.ingress.labels }}
@@ -45,12 +44,12 @@ spec:
             backend:
               {{- if $ingressApiIsStable }}
               service:
-                name: {{ include "tempo.resourceName" $dict }}
+                name: {{ include "tempo.fullname" $ }}-{{ $svcName }}
                 port:
-                  number: {{ $.Values.ingress.service.port }}
+                  number: {{ include "tempo.serverHttpListenPort" $ }}
               {{- else }}
-              serviceName: {{ include "tempo.resourceName" $dict }}
-              servicePort: {{ $.Values.ingress.service.port }}
+              serviceName: {{ include "tempo.fullname" $ }}-{{ $svcName }}
+              servicePort: {{ include "tempo.serverHttpListenPort" $ }}
               {{- end }}
             {{- end }}
           {{- end }}