From b4ccf83f598d44b3bb959b122ea622e031fa5e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Heleno?= <33546359+lentidas@users.noreply.github.com> Date: Tue, 11 Jul 2023 14:55:16 +0200 Subject: [PATCH] feat!: add support to oboukili/argocd >= v5 (#10) * feat!: add support to oboukili/argocd >= v5 * docs(terraform-docs): generate docs and write to README.adoc --------- Co-authored-by: lentidas --- README.adoc | 16 ++++++++-------- main.tf | 15 ++++++++++----- terraform.tf | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index 6eff64b..e741fcb 100644 --- a/README.adoc +++ b/README.adoc @@ -66,7 +66,7 @@ This module must be one of the first ones to be deployed and consequently it nee The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_null]] <> (>= 3) @@ -76,11 +76,11 @@ The following requirements are needed by this module: The following providers are used by this module: -- [[provider_null]] <> (>= 3) - - [[provider_utils]] <> (>= 1) -- [[provider_argocd]] <> (>= 4) +- [[provider_argocd]] <> (>= 5) + +- [[provider_null]] <> (>= 3) === Modules @@ -136,7 +136,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.1"` +Default: `"v1.0.2"` ==== [[input_helm_values]] <> @@ -222,7 +222,7 @@ Description: ID to pass other modules in order to refer to this module as a depe [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[requirement_argocd]] <> |>= 4 +|[[requirement_argocd]] <> |>= 5 |[[requirement_null]] <> |>= 3 |[[requirement_utils]] <> |>= 1 |=== @@ -233,7 +233,7 @@ Description: ID to pass other modules in order to refer to this module as a depe |=== |Name |Version |[[provider_utils]] <> |>= 1 -|[[provider_argocd]] <> |>= 4 +|[[provider_argocd]] <> |>= 5 |[[provider_null]] <> |>= 3 |=== @@ -277,7 +277,7 @@ Description: ID to pass other modules in order to refer to this module as a depe |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.1"` +|`"v1.0.2"` |no |[[input_helm_values]] <> diff --git a/main.tf b/main.tf index c6fdd77..20f780b 100644 --- a/main.tf +++ b/main.tf @@ -81,14 +81,19 @@ resource "argocd_application" "this" { } sync_policy { - automated = var.app_autosync + automated { + prune = var.app_autosync.prune + self_heal = var.app_autosync.self_heal + allow_empty = var.app_autosync.allow_empty + } retry { - backoff = { - duration = "" - max_duration = "" + backoff { + duration = "20s" + max_duration = "2m" + factor = "2" } - limit = "0" + limit = "5" } sync_options = [ diff --git a/terraform.tf b/terraform.tf index a3c32a6..d0a8e8b 100644 --- a/terraform.tf +++ b/terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { argocd = { source = "oboukili/argocd" - version = ">= 4" + version = ">= 5" } utils = { source = "cloudposse/utils"