Merge branch 'main' into main

Author: Sheikh-Abubaker

charts/grafana/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 9.0.0
-appVersion: 12.0.0
+version: 9.1.1
+appVersion: 12.0.0-security-01
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com

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

@@ -1,4 +1,4 @@
-{{- if .Values.imageRenderer.serviceMonitor.enabled }}
+{{- if and .Values.imageRenderer.enabled .Values.imageRenderer.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

charts/rollout-operator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.28.0
-appVersion: v0.26.0
+version: 0.29.0
+appVersion: v0.27.0
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0

charts/rollout-operator/README.md

@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
 
 # rollout-operator
 
-![Version: 0.28.0](https://img.shields.io/badge/Version-0.28.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.26.0](https://img.shields.io/badge/AppVersion-v0.26.0-informational?style=flat-square)
+![Version: 0.29.0](https://img.shields.io/badge/Version-0.29.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.27.0](https://img.shields.io/badge/AppVersion-v0.27.0-informational?style=flat-square)
 
 Grafana rollout-operator
 

charts/tempo-distributed/README.md

@@ -617,6 +617,18 @@ 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.annotations | object | `{}` |  |
+| ingress.enabled | bool | `false` | If you enable this, make sure to disable the gateway's ingress. |
+| ingress.hosts[0] | string | `"tempo.example.com"` |  |
+| ingress.paths.compactor[0].path | string | `"/compactor/ring"` |  |
+| ingress.paths.distributor[0].path | string | `"/v1/traces"` |  |
+| ingress.paths.distributor[0].port | int | `4318` |  |
+| ingress.paths.distributor[1].path | string | `"/distributor/ring"` |  |
+| ingress.paths.distributor[2].path | string | `"/ingester/ring"` |  |
+| ingress.paths.distributor[3].path | string | `"/metrics-generator/ring"` |  |
+| ingress.paths.ingester[0].path | string | `"/flush"` |  |
+| ingress.paths.ingester[1].path | string | `"/shutdown"` |  |
+| ingress.paths.query-frontend[0].path | string | `"/api"` |  |
 | kubectlImage.pullPolicy | string | `"IfNotPresent"` |  |
 | kubectlImage.repository | string | `"bitnami/kubectl"` |  |
 | kubectlImage.tag | string | `"latest"` |  |

charts/tempo-distributed/templates/compactor/deployment-compactor.yaml

@@ -12,7 +12,9 @@ metadata:
   {{- end }}
 spec:
   minReadySeconds: {{ .Values.compactor.minReadySeconds }}
+{{- if not .Values.compactor.autoscaling.enabled }}
   replicas: {{ .Values.compactor.replicas }}
+{{- end }}
   revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }}
   selector:
     matchLabels:

charts/tempo-distributed/templates/gateway/ingress-gateway.yaml

@@ -1,3 +1,7 @@
+{{- if and .Values.ingress.enabled .Values.gateway.ingress.enabled -}}
+{{- fail "You have selected both ingress.enabled and gateway.ingress.enabled, you must select either ingress or gateway but not both" -}}
+{{- end -}}
+
 {{- if .Values.gateway.enabled -}}
 {{- if .Values.gateway.ingress.enabled -}}
 {{ $dict := dict "ctx" . "component" "gateway"  }}

charts/tempo-distributed/templates/ingress.yaml

@@ -0,0 +1,57 @@
+{{- if .Values.ingress.enabled }}
+{{- $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.fullname" . }}
+  labels:
+    {{- include "tempo.labels" (dict "ctx" . "component" "gateway") | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+    {{- toYaml . | nindent 4}}
+    {{- end}}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end -}}
+  {{- with .Values.ingress.tls }}
+  tls:
+    {{- range . }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      {{- with .secretName }}
+      secretName: {{ . }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range $.Values.ingress.hosts }}
+    - host: {{ . | quote }}
+      http:
+        paths:
+          {{- range $svcName, $paths := $.Values.ingress.paths }}
+            {{- range $paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType | default "Prefix" }}
+            backend:
+              {{- if $ingressApiIsStable }}
+              service:
+                name: {{ include "tempo.fullname" $ }}-{{ $svcName }}
+                port:
+                  number: {{ .port | default (printf "%s" (include "tempo.serverHttpListenPort" $ )) }}
+              {{- else }}
+              serviceName: {{ include "tempo.fullname" $ }}-{{ $svcName }}
+              servicePort: {{ .port | default (printf "%s" (include "tempo.serverHttpListenPort" $ )) }}
+              {{- end }}
+            {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}

charts/tempo-distributed/values.yaml

@@ -2196,6 +2196,30 @@ gateway:
         {{- end }}
       }
 
+ingress:
+  # -- If you enable this, make sure to disable the gateway's ingress.
+  enabled: false
+  # ingressClassName: nginx
+  annotations: {}
+  paths:
+    distributor:
+      - path: /v1/traces
+        port: 4318
+      - path: /distributor/ring
+        # -- pathType (e.g. ImplementationSpecific, Prefix, .. etc.) might also be required by some Ingress Controllers
+        # pathType: Prefix
+      - path: /ingester/ring
+      - path: /metrics-generator/ring
+    ingester:
+      - path: /flush
+      - path: /shutdown
+    query-frontend:
+      - path: /api
+    compactor:
+      - path: /compactor/ring
+  hosts:
+    - tempo.example.com
+
 ##############################################################################
 # The values in and after the `enterprise:` key configure the enterprise features
 enterprise: