Merge branch 'main' into tempo-distributed/support-max_attribute_bytes-param

Author: Sheikh-Abubaker

charts/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 9.3.3
+version: 9.3.4
 appVersion: 12.1.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

charts/grafana/templates/headless-service.yaml

@@ -19,4 +19,5 @@ spec:
   ports:
   - name: {{ .Values.gossipPortName }}-tcp
     port: 9094
+    targetPort: {{ .Values.gossipPortName }}-tcp
 {{- end }}

charts/grafana/templates/image-renderer-service.yaml

@@ -22,7 +22,7 @@ spec:
     - name: {{ .Values.imageRenderer.service.portName }}
       port: {{ .Values.imageRenderer.service.port }}
       protocol: TCP
-      targetPort: {{ .Values.imageRenderer.service.targetPort }}
+      targetPort: {{ .Values.imageRenderer.service.portName }}
       {{- with .Values.imageRenderer.appProtocol }}
       appProtocol: {{ . }}
       {{- end }}

charts/grafana/templates/service.yaml

@@ -55,7 +55,7 @@ spec:
     - name: {{ .Values.service.portName }}
       port: {{ .Values.service.port }}
       protocol: TCP
-      targetPort: {{ .Values.service.targetPort }}
+      targetPort: {{ .Values.podPortName }}
       {{- with .Values.service.appProtocol }}
       appProtocol: {{ . }}
       {{- end }}