diff --git a/production/ksonnet/loki/config.libsonnet b/production/ksonnet/loki/config.libsonnet index 60a7219fd1f7c842063b03d53faf4085774b7899..e968239b4b41a9f83d633c68c08ffb6f2b95c63c 100644 --- a/production/ksonnet/loki/config.libsonnet +++ b/production/ksonnet/loki/config.libsonnet @@ -11,7 +11,7 @@ // December 11 is when we first launched to the public. // Assume we can ingest logs that are 5months old. - schema_start_date: '2018-07-11', + schema_start_date: '2018-07-11', commonArgs: { 'config.file': '/etc/loki/config.yaml', @@ -84,4 +84,11 @@ configMap.withData({ 'config.yaml': $.util.manifestYaml($._config.loki), }), + + local deployment = $.apps.v1beta1.deployment, + + config_hash_mixin:: + deployment.mixin.spec.template.metadata.withAnnotationsMixin({ + config_hash: std.md5(std.toString($._config.loki)), + }), } diff --git a/production/ksonnet/loki/distributor.libsonnet b/production/ksonnet/loki/distributor.libsonnet index 2e44d9ae799eeb46abbf9da84a40ae5075f15a41..ac767705704406dc59ec655463c7baa6ee42e69d 100644 --- a/production/ksonnet/loki/distributor.libsonnet +++ b/production/ksonnet/loki/distributor.libsonnet @@ -16,6 +16,7 @@ distributor_deployment: deployment.new('distributor', 3, [$.distributor_container]) + + $.config_hash_mixin + $.util.configVolumeMount('loki', '/etc/loki') + $.util.antiAffinity, diff --git a/production/ksonnet/loki/ingester.libsonnet b/production/ksonnet/loki/ingester.libsonnet index d9380529caea2b3fd5e638866d8e26c7555dc0bc..31860be20fcbc0a5876d67157f35c9f93f8e7d9f 100644 --- a/production/ksonnet/loki/ingester.libsonnet +++ b/production/ksonnet/loki/ingester.libsonnet @@ -19,6 +19,7 @@ ingester_deployment: deployment.new('ingester', 3, [$.ingester_container]) + + $.config_hash_mixin + $.util.configVolumeMount('loki', '/etc/loki') + $.util.antiAffinity + deployment.mixin.spec.withMinReadySeconds(60) + diff --git a/production/ksonnet/loki/querier.libsonnet b/production/ksonnet/loki/querier.libsonnet index d6f143de88b935a3ee068e21a202a024ee56e7e5..40329ab34c1479bce45e359fd2ba313ca83c514c 100644 --- a/production/ksonnet/loki/querier.libsonnet +++ b/production/ksonnet/loki/querier.libsonnet @@ -15,6 +15,7 @@ querier_deployment: deployment.new('querier', 3, [$.querier_container]) + + $.config_hash_mixin + $.util.configVolumeMount('loki', '/etc/loki') + $.util.antiAffinity,