Merge branch 'main' into default-port

Author: Sheikh-Abubaker

charts/tempo-distributed/README.md

@@ -451,8 +451,8 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` |
 | enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the enterprise-gateway ingress |
 | enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the enterprise-gateway should be created |
-| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the enterprise-gateway ingress |
-| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.gem.example.com"],"secretName":"gem-gateway-tls"}]` | TLS configuration for the enterprise-gateway ingress |
+| enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.get.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the enterprise-gateway ingress |
+| enterpriseGateway.ingress.tls | list | `[{"hosts":["gateway.get.example.com"],"secretName":"get-gateway-tls"}]` | TLS configuration for the enterprise-gateway ingress |
 | enterpriseGateway.initContainers | list | `[]` |  |
 | enterpriseGateway.nodeSelector | object | `{}` |  |
 | enterpriseGateway.persistence.subPath | string | `nil` |  |

charts/tempo-distributed/templates/NOTES.txt

@@ -13,9 +13,25 @@ Installed components:
 * federation-frontend
 {{- end }}
 * compactor
+{{- if .Values.metricsGenerator.enabled }}
+* metrics-generator
+{{- end }}
 {{- if .Values.memcached.enabled }}
 * memcached
 {{- end }}
+{{- if .Values.memcachedExporter.enabled }}
+* memcached-exporter
+{{- end }}
 {{- if .Values.gateway.enabled }}
 * gateway
-{{- end }}
+{{- end }}
+{{- if .Values.minio.enabled }}
+* minio
+{{- end }}
+{{- if .Values.rollout_operator.enabled }}
+* rollout-operator
+{{- end }}
+{{- if .Values.enterprise.enabled }}
+* admin_api
+* enterprise-gateway
+{{- end }}

charts/tempo-distributed/values.yaml

@@ -2531,16 +2531,16 @@ enterpriseGateway:
     annotations: {}
     # -- Hosts configuration for the enterprise-gateway ingress
     hosts:
-      - host: gateway.gem.example.com
+      - host: gateway.get.example.com
         paths:
           - path: /
             # -- pathType (e.g. ImplementationSpecific, Prefix, .. etc.) might also be required by some Ingress Controllers
             # pathType: Prefix
     # -- TLS configuration for the enterprise-gateway ingress
     tls:
-      - secretName: gem-gateway-tls
+      - secretName: get-gateway-tls
         hosts:
-          - gateway.gem.example.com
+          - gateway.get.example.com
 
 # -- Create extra manifests via values.
 extraObjects: []