From 3e8ac4b4ca407f5185dfa4becc22f56dc750afe7 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Mon, 8 Feb 2021 13:48:06 +0100 Subject: Customize helm "--timeout" option format if running helm v3 Helm v3 requires unit definition for 'timeout' option which is not supported by Helm v2. Change-Id: Ia5839e5c412be1700459c70d43d2e6cc0400633d Issue-ID: OOM-2665 Signed-off-by: Bartek Grzybowski --- ansible/roles/application/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ansible/roles/application/defaults/main.yml') diff --git a/ansible/roles/application/defaults/main.yml b/ansible/roles/application/defaults/main.yml index 6a7472a6..8e630f73 100644 --- a/ansible/roles/application/defaults/main.yml +++ b/ansible/roles/application/defaults/main.yml @@ -2,7 +2,7 @@ helm_repository_name: local helm_repository_url: http://127.0.0.1:8879 helm_extra_install_options: - - { opt: '--timeout 1800'} + - { opt: "{% if helm_version | regex_search('^v3' ) %}{{ '--timeout 1800s' }}{% else %}{{ '--timeout 1800' }}{% endif %}"} # Override file generation for Helm application can be customized by any role # given by user and found by ansible from roles_path. # By default override file is generated by 'application-override' role that -- cgit 1.2.3-korg