From 27f6da33cad382e89439750d78d11656996c3478 Mon Sep 17 00:00:00 2001 From: Julien Francoz Date: Sat, 8 Jul 2023 23:56:10 +0200 Subject: [PATCH] Replace deprecated failure-domain topology Signed-off-by: Julien Francoz --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/values.yaml | 36 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 5bafedef95..5f1106fd91 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.4.7 +version: 1.4.8 appVersion: 2.1.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 542a24e786..4e3c861e81 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.4.7](https://img.shields.io/badge/Version-1.4.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) +![Version: 1.4.8](https://img.shields.io/badge/Version-1.4.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index b5199f42d7..861f74ccb2 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -150,7 +150,7 @@ ingester: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -171,7 +171,7 @@ ingester: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "ingester") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone # -- Node selector for ingester pods nodeSelector: {} # -- Tolerations for ingester pods @@ -255,7 +255,7 @@ metricsGenerator: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -275,7 +275,7 @@ metricsGenerator: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "metrics-generator") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone # -- Node selector for metrics-generator pods nodeSelector: {} # -- Tolerations for metrics-generator pods @@ -392,7 +392,7 @@ distributor: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -412,7 +412,7 @@ distributor: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "distributor") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone # -- Node selector for distributor pods nodeSelector: {} # -- Tolerations for distributor pods @@ -554,7 +554,7 @@ querier: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -574,7 +574,7 @@ querier: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "querier" "memberlist" true) | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone # -- Node selector for querier pods nodeSelector: {} # -- Tolerations for querier pods @@ -735,7 +735,7 @@ queryFrontend: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -755,7 +755,7 @@ queryFrontend: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "query-frontend") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone # -- Node selector for query-frontend pods nodeSelector: {} # -- Tolerations for query-frontend pods @@ -1168,7 +1168,7 @@ memcached: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -1188,7 +1188,7 @@ memcached: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "memcached") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone service: # -- Annotations for memcached service annotations: {} @@ -1421,7 +1421,7 @@ gateway: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -1441,7 +1441,7 @@ gateway: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "gateway") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone # -- Node selector for gateway pods nodeSelector: {} # -- Tolerations for gateway pods @@ -1682,7 +1682,7 @@ adminApi: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -1703,7 +1703,7 @@ adminApi: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "admin-api") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone # Pod Disruption Budget podDisruptionBudget: {} @@ -1770,7 +1770,7 @@ enterpriseGateway: # @default -- Defaults to allow skew no more then 1 node per AZ topologySpreadConstraints: | - maxSkew: 1 - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: @@ -1791,7 +1791,7 @@ enterpriseGateway: labelSelector: matchLabels: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "enterprise-gateway") | nindent 12 }} - topologyKey: failure-domain.beta.kubernetes.io/zone + topologyKey: topology.kubernetes.io/zone securityContext: {}