From d6bcc0cca2ca696bbd752a0b67589c5b245b0e94 Mon Sep 17 00:00:00 2001 From: Hugo Bollon Date: Tue, 11 Jul 2023 14:32:53 +0200 Subject: [PATCH] feat!: add support to oboukili/argocd v5 (#75) * feat!: add support to oboukili/argocd v5 * docs(terraform-docs): generate docs and write to README.adoc --------- Co-authored-by: hbollon --- README.adoc | 16 ++++++++-------- aks/README.adoc | 8 ++++---- eks/README.adoc | 8 ++++---- kind/README.adoc | 8 ++++---- main.tf | 15 ++++++++++----- sks/README.adoc | 8 ++++---- terraform.tf | 2 +- 7 files changed, 35 insertions(+), 30 deletions(-) diff --git a/README.adoc b/README.adoc index 391fcdd0..ccd89f18 100644 --- a/README.adoc +++ b/README.adoc @@ -3,7 +3,7 @@ The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_htpasswd]] <> (>= 1) @@ -17,15 +17,15 @@ The following requirements are needed by this module: The following providers are used by this module: -- [[provider_null]] <> (>= 3) - - [[provider_random]] <> (>= 3) - [[provider_htpasswd]] <> (>= 1) - [[provider_utils]] <> (>= 1) -- [[provider_argocd]] <> (>= 4) +- [[provider_argocd]] <> (>= 5) + +- [[provider_null]] <> (>= 3) === Resources @@ -57,7 +57,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v3.0.0"` +Default: `"v3.0.1"` ==== [[input_namespace]] <> @@ -165,7 +165,7 @@ Description: Credentials to access the Loki ingress, if activated. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[requirement_argocd]] <> |>= 4 +|[[requirement_argocd]] <> |>= 5 |[[requirement_htpasswd]] <> |>= 1 |[[requirement_null]] <> |>= 3 |[[requirement_random]] <> |>= 3 @@ -181,7 +181,7 @@ Description: Credentials to access the Loki ingress, if activated. |[[provider_random]] <> |>= 3 |[[provider_htpasswd]] <> |>= 1 |[[provider_utils]] <> |>= 1 -|[[provider_argocd]] <> |>= 4 +|[[provider_argocd]] <> |>= 5 |=== = Resources @@ -212,7 +212,7 @@ Description: Credentials to access the Loki ingress, if activated. |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v3.0.0"` +|`"v3.0.1"` |no |[[input_namespace]] <> diff --git a/aks/README.adoc b/aks/README.adoc index 0bd0e028..24c27cb1 100644 --- a/aks/README.adoc +++ b/aks/README.adoc @@ -3,7 +3,7 @@ The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_htpasswd]] <> (>= 1) @@ -77,7 +77,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v3.0.0"` +Default: `"v3.0.1"` ==== [[input_namespace]] <> @@ -185,7 +185,7 @@ Description: Credentials to access the Loki ingress, if activated. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[requirement_argocd]] <> |>= 4 +|[[requirement_argocd]] <> |>= 5 |[[requirement_htpasswd]] <> |>= 1 |[[requirement_null]] <> |>= 3 |[[requirement_random]] <> |>= 3 @@ -252,7 +252,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v3.0.0"` +|`"v3.0.1"` |no |[[input_namespace]] <> diff --git a/eks/README.adoc b/eks/README.adoc index 72216813..4d9e4013 100644 --- a/eks/README.adoc +++ b/eks/README.adoc @@ -3,7 +3,7 @@ The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_htpasswd]] <> (>= 1) @@ -59,7 +59,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v3.0.0"` +Default: `"v3.0.1"` ==== [[input_namespace]] <> @@ -167,7 +167,7 @@ Description: Credentials to access the Loki ingress, if activated. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[requirement_argocd]] <> |>= 4 +|[[requirement_argocd]] <> |>= 5 |[[requirement_htpasswd]] <> |>= 1 |[[requirement_null]] <> |>= 3 |[[requirement_random]] <> |>= 3 @@ -212,7 +212,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v3.0.0"` +|`"v3.0.1"` |no |[[input_namespace]] <> diff --git a/kind/README.adoc b/kind/README.adoc index 04ca9b8f..ff584d59 100644 --- a/kind/README.adoc +++ b/kind/README.adoc @@ -3,7 +3,7 @@ The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_htpasswd]] <> (>= 1) @@ -61,7 +61,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v3.0.0"` +Default: `"v3.0.1"` ==== [[input_namespace]] <> @@ -169,7 +169,7 @@ Description: Credentials to access the Loki ingress, if activated. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[requirement_argocd]] <> |>= 4 +|[[requirement_argocd]] <> |>= 5 |[[requirement_htpasswd]] <> |>= 1 |[[requirement_null]] <> |>= 3 |[[requirement_random]] <> |>= 3 @@ -216,7 +216,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v3.0.0"` +|`"v3.0.1"` |no |[[input_namespace]] <> diff --git a/main.tf b/main.tf index 7cb3626e..09094fe6 100644 --- a/main.tf +++ b/main.tf @@ -76,14 +76,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/sks/README.adoc b/sks/README.adoc index e89642ba..ae42300b 100644 --- a/sks/README.adoc +++ b/sks/README.adoc @@ -99,7 +99,7 @@ This module requires a Persistent Volume so it needs to be deployed after the mo The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_htpasswd]] <> (>= 1) @@ -162,7 +162,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v3.0.0"` +Default: `"v3.0.1"` ==== [[input_namespace]] <> @@ -276,7 +276,7 @@ Description: Credentials to access the Loki ingress, if activated. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[requirement_argocd]] <> |>= 4 +|[[requirement_argocd]] <> |>= 5 |[[requirement_htpasswd]] <> |>= 1 |[[requirement_null]] <> |>= 3 |[[requirement_random]] <> |>= 3 @@ -328,7 +328,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v3.0.0"` +|`"v3.0.1"` |no |[[input_namespace]] <> diff --git a/terraform.tf b/terraform.tf index 216653e5..ee509496 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"