From 51c477fb07d664b1bd00a140b97ff01b23129671 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Fri, 14 Jul 2023 10:48:18 +0200 Subject: [PATCH] feat: Upgrade version endpoint component --- .../roles/metacluster/tasks/json-server.yml | 6 +++-- ansible/vars/metacluster.yml | 27 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git 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 index 599d368..38aa308 100644 --- 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 @@ -11,8 +11,10 @@ {{ components['json-server'].chart_values | combine( { - 'seedData': { - 'configInline': ( components['json-server'].chart_values.seedData.configInline | to_json ) + 'jsonServer': { + 'seedData': { + 'configInline': ( components['json-server'].chart_values.jsonServer.seedData.configInline | to_json ) + } } } ) }} diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index 038ff18..a08887f 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -177,7 +177,7 @@ components: json-server: helm: - version: v0.6.0 + version: v0.7.3 chart: spamasaurus/json-server parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' chart_values: !unsafe | @@ -188,18 +188,19 @@ components: paths: - path: / pathType: Prefix - seedData: - configInline: | - { - "appliance": { "version": "{{ appliance.version }}" }, - "components": [ - { "app": "cluster-api", - "management": { "foo": "bar" }, - "workload": { "foo": "bar" } - } - ], - "healthz": { "status": "running" } - } + jsonServer: + seedData: + configInline: | + { + "appliance": { "version": "{{ appliance.version }}" }, + "components": [ + { "app": "cluster-api", + "management": { "foo": "bar" }, + "workload": { "foo": "bar" } + } + ], + "healthz": { "status": "running" } + } kube-prometheus-stack: helm: