fix: Refactor version endpoint json creation to guarantee variable substitution

2023-07-19 16:46:23 +02:00 · 2023-07-19 16:46:23 +02:00 · 393b1092e5
commit 393b1092e5
parent 36c30ca646
2 changed files with 6 additions and 8 deletions
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/json-server.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/json-server.yml
@ -31,13 +31,11 @@
        values: |
          {{
            components['json-server'].chart_values |
-            combine( {
-              'jsonServer': {
-                'seedData': {
-                  'configInline': (components['json-server'].chart_values.jsonServer.seedData.configInline | combine( { 'components': manifest_versions } ) | to_json)
-                }
-              }
-            } )
+            combine( { 'jsonServer': { 'seedData': { 'configInline': (
+              components['json-server'].chart_values.jsonServer.seedData.configInline |
+              combine( { 'components': manifest_versions }, { 'appliance': { "version": appliance.version } } ) |
+              to_json
+            ) } } } )
          }}

    - name: Ensure json-server API availability
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@ -192,7 +192,7 @@ components:
          seedData:
            configInline: |
              {
-                "appliance": { "version": "{{ appliance.version }}" },
+                "appliance": {},
                "components": [],
                "healthz": { "status": "running" }
              }