Added antiaffinity and scoped config hashes (#550)

Signed-off-by: Joe Elliott <number101010@gmail.com>
grafana · Feb 24, 2021 · f44fb72 · f44fb72
1 parent 6456fb9
commit f44fb72
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/operations/jsonnet/microservices/compactor.libsonnet b/operations/jsonnet/microservices/compactor.libsonnet
@@ -36,7 +36,7 @@
     deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) +
     deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1) +
     deployment.mixin.spec.template.metadata.withAnnotations({
-      config_hash: std.md5(std.toString($.tempo_compactor_configmap)),
+      config_hash: std.md5(std.toString($.tempo_compactor_configmap.data['tempo.yaml'])),
     }) +
     deployment.mixin.spec.template.spec.withVolumes([
       volume.fromConfigMap(tempo_config_volume, $.tempo_compactor_configmap.metadata.name),

diff --git a/operations/jsonnet/microservices/distributor.libsonnet b/operations/jsonnet/microservices/distributor.libsonnet
@@ -37,7 +37,7 @@
                      [$._config.gossip_member_label]: 'true',
                    }) +
     deployment.mixin.spec.template.metadata.withAnnotations({
-      config_hash: std.md5(std.toString($.tempo_configmap)),
+      config_hash: std.md5(std.toString($.tempo_configmap.data['tempo.yaml'])),
     }) +
     deployment.mixin.spec.template.spec.withVolumes([
       volume.fromConfigMap(tempo_config_volume, $.tempo_configmap.metadata.name),

diff --git a/operations/jsonnet/microservices/frontend.libsonnet b/operations/jsonnet/microservices/frontend.libsonnet
@@ -57,7 +57,7 @@
     deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) +
     deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1) +
     deployment.mixin.spec.template.metadata.withAnnotations({
-      config_hash: std.md5(std.toString($.tempo_query_frontend_configmap)),
+      config_hash: std.md5(std.toString($.tempo_query_frontend_configmap.data['tempo.yaml'])),
     }) +
     deployment.mixin.spec.template.spec.withVolumes([
       volume.fromConfigMap(tempo_query_config_volume, $.tempo_query_configmap.metadata.name),

diff --git a/operations/jsonnet/microservices/ingester.libsonnet b/operations/jsonnet/microservices/ingester.libsonnet
@@ -48,6 +48,7 @@
         [$._config.gossip_member_label]: 'true',
       },
     )
+    + $.util.antiAffinity
     + statefulset.mixin.spec.withServiceName(target_name)
     + statefulset.mixin.spec.template.spec.withVolumes([
       volume.fromConfigMap(tempo_config_volume, $.tempo_configmap.metadata.name),

diff --git a/operations/jsonnet/microservices/querier.libsonnet b/operations/jsonnet/microservices/querier.libsonnet
@@ -38,7 +38,7 @@
     deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) +
     deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1) +
     deployment.mixin.spec.template.metadata.withAnnotations({
-      config_hash: std.md5(std.toString($.tempo_querier_configmap)),
+      config_hash: std.md5(std.toString($.tempo_querier_configmap.data['tempo.yaml'])),
     }) +
     deployment.mixin.spec.template.spec.withVolumes([
       volume.fromConfigMap(tempo_config_volume, $.tempo_querier_configmap.metadata.name),

diff --git a/operations/jsonnet/single-binary/tempo.libsonnet b/operations/jsonnet/single-binary/tempo.libsonnet
@@ -73,7 +73,7 @@
                    { app: 'tempo' }) +
     statefulset.mixin.spec.withServiceName('tempo') +
     statefulset.mixin.spec.template.metadata.withAnnotations({
-      config_hash: std.md5(std.toString($.tempo_configmap)),
+      config_hash: std.md5(std.toString($.tempo_configmap.data['tempo.yaml'])),
     }) +
     statefulset.mixin.spec.template.spec.withVolumes([
       volume.fromConfigMap(tempo_query_config_volume, $.tempo_query_configmap.metadata.name),