From 12a559b6120a9bc07ea25e84fa80e19a148844d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarom=C3=ADr=20Hradil?= <jaromir.hradil@cesnet.cz>
Date: Tue, 17 Sep 2024 15:26:20 +0200
Subject: [PATCH] Updating accounting chart version + adding testing accounting
deployment
---
common/playbooks/accounting.yaml | 6 +++---
testing/playbooks/accounting.yaml | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
create mode 120000 testing/playbooks/accounting.yaml
diff --git a/common/playbooks/accounting.yaml b/common/playbooks/accounting.yaml
index c16aabe..53d4cf8 100644
--- a/common/playbooks/accounting.yaml
+++ b/common/playbooks/accounting.yaml
@@ -9,11 +9,11 @@
when: "'egi-accounting' not in ansible_local.helm_repos | map(attribute='name') | list"
- name: Get credentials from Vault for accounting
set_fact:
- secrets: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'accounting') | path_join,
+ secrets: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'accounting') | join('/'),
token_validate=false) }}"
- name: Get accounting installation ID from Vault
set_fact:
- secrets: "{{ secrets | combine(lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | path_join,
+ secrets: "{{ secrets | combine(lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | join('/'),
token_validate=false)) }}"
- name: Debug accounting secrets
debug:
@@ -27,7 +27,7 @@
- name: Deploy/upgrade accounting instance
vars:
name: "notebooks-accounting"
- version: "0.2.1"
+ version: "0.2.2"
shell: |-
helm status --namespace accounting {{ name }}
if [ $? -ne 0 ]; then
diff --git a/testing/playbooks/accounting.yaml b/testing/playbooks/accounting.yaml
new file mode 120000
index 0000000..8928484
--- /dev/null
+++ b/testing/playbooks/accounting.yaml
@@ -0,0 +1 @@
+../../common/playbooks/accounting.yaml
\ No newline at end of file
--
GitLab