From 1204a322edf486456884641bfc25157999428aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yves=20M=C3=BCller?= Date: Tue, 12 Nov 2019 17:24:31 +0100 Subject: [PATCH] sort keys in service configuration This is required to get an idempotent deployment, due to the order of keys in a dict being randomized in python. --- templates/service.json.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/service.json.j2 b/templates/service.json.j2 index bb381d8b..c9b8a18d 100644 --- a/templates/service.json.j2 +++ b/templates/service.json.j2 @@ -17,23 +17,23 @@ "kind": "{{ item.kind }}", {% endif -%} {% if item.proxy is defined -%} - "proxy": {{ item.proxy | to_json }}, + "proxy": {{ item.proxy | to_json(sort_keys=True) }}, {% endif -%} {% if item.meta is defined -%} - "meta": {{ item.meta | to_json }}, + "meta": {{ item.meta | to_json(sort_keys=True) }}, {% endif -%} {% if item.checks is defined -%} - "checks": {{ item.checks | to_json }}, + "checks": {{ item.checks | to_json(sort_keys=True) }}, {% endif -%} {% if item.connect is defined -%} - "connect": {{ item.connect | to_json }}, + "connect": {{ item.connect | to_json(sort_keys=True) }}, {% endif -%} {% if item.weights is defined -%} - "weights": {{ item.weights | to_json }}, + "weights": {{ item.weights | to_json(sort_keys=True) }}, {% endif -%} {% if item.token is defined -%} "token": {{ item.token | to_json }}, {% endif -%} - "tags": {% if item.tags is defined -%}{{ item.tags|to_json }}{% else %}[]{% endif -%} + "tags": {{ item.tags|default([])|to_json(sort_keys=True) }} } }