diff --git a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml index a049426f..702cb733 100644 --- a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system --- @@ -5515,7 +5515,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system --- @@ -5939,7 +5939,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system spec: @@ -5947,9 +5947,6 @@ spec: - name: tempo-grpc port: 9095 targetPort: 9095 - - name: tempo-prom-metrics - port: 3100 - targetPort: 3100 - name: tempo-jaeger-thrift-compact port: 6831 protocol: UDP @@ -5958,6 +5955,10 @@ spec: port: 6832 protocol: UDP targetPort: 6832 + - name: tempo-prom-metrics + port: 3100 + protocol: TCP + targetPort: 3100 - name: tempo-jaeger-thrift-http port: 14268 protocol: TCP @@ -5977,7 +5978,7 @@ spec: - name: tempo-otlp-http-legacy port: 55681 protocol: TCP - targetPort: 4318 + targetPort: 55681 - name: grpc-tempo-otlp port: 4317 protocol: TCP @@ -6538,7 +6539,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system spec: @@ -6551,7 +6552,7 @@ spec: template: metadata: annotations: - checksum/config: 843c5f00f69ab03b534bd4e5562c5abd4d71fd285cd0ef0d6ef20ce84e21f4ea + checksum/config: 87dd368efe845e2aa7ac0d5740dada492277bf7134edb4363602976415f9c2ac logs.grafana.com/scrape: "true" logs.grafana.com/scrub-level: info profiles.grafana.com/cpu.port_name: prom-metrics diff --git a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml index 1091a35c..bc492f80 100644 --- a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml @@ -62,7 +62,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system --- @@ -5117,7 +5117,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system --- @@ -5417,7 +5417,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system spec: @@ -5425,9 +5425,6 @@ spec: - name: tempo-grpc port: 9095 targetPort: 9095 - - name: tempo-prom-metrics - port: 3100 - targetPort: 3100 - name: tempo-jaeger-thrift-compact port: 6831 protocol: UDP @@ -5436,6 +5433,10 @@ spec: port: 6832 protocol: UDP targetPort: 6832 + - name: tempo-prom-metrics + port: 3100 + protocol: TCP + targetPort: 3100 - name: tempo-jaeger-thrift-http port: 14268 protocol: TCP @@ -5455,7 +5456,7 @@ spec: - name: tempo-otlp-http-legacy port: 55681 protocol: TCP - targetPort: 4318 + targetPort: 55681 - name: grpc-tempo-otlp port: 4317 protocol: TCP @@ -5827,7 +5828,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: tempo app.kubernetes.io/version: 2.6.1 - helm.sh/chart: tempo-1.14.0 + helm.sh/chart: tempo-1.15.0 name: tempo namespace: tracing-system spec: @@ -5840,7 +5841,7 @@ spec: template: metadata: annotations: - checksum/config: 843c5f00f69ab03b534bd4e5562c5abd4d71fd285cd0ef0d6ef20ce84e21f4ea + checksum/config: 87dd368efe845e2aa7ac0d5740dada492277bf7134edb4363602976415f9c2ac logs.grafana.com/scrape: "true" logs.grafana.com/scrub-level: info profiles.grafana.com/cpu.port_name: prom-metrics diff --git a/kubernetes/monolithic-mode/traces/tempo/kustomization.yaml b/kubernetes/monolithic-mode/traces/tempo/kustomization.yaml index 794873a4..8df3dcf6 100644 --- a/kubernetes/monolithic-mode/traces/tempo/kustomization.yaml +++ b/kubernetes/monolithic-mode/traces/tempo/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: tracing-system helmCharts: - name: tempo - version: 1.14.0 + version: 1.15.0 repo: https://grafana.github.io/helm-charts releaseName: tempo namespace: tracing-system diff --git a/kubernetes/monolithic-mode/traces/tempo/values.yaml b/kubernetes/monolithic-mode/traces/tempo/values.yaml index 2b9ce226..310b8c85 100644 --- a/kubernetes/monolithic-mode/traces/tempo/values.yaml +++ b/kubernetes/monolithic-mode/traces/tempo/values.yaml @@ -263,6 +263,12 @@ serviceAccount: service: type: ClusterIP + clusterIP: "" + # -- (string) IP address, in case of 'type: LoadBalancer' + loadBalancerIP: + # -- If service type is LoadBalancer, the exposed protocol can either be "UDP", "TCP" or "UDP,TCP" + protocol: "TCP" + annotations: {} labels: {} targetPort: ""