From 6cf49f5bfeb3e52410aa4ce8efa05f7414005768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Heleno?= Date: Mon, 10 Jul 2023 15:21:08 +0200 Subject: [PATCH 1/2] feat!: add support to oboukili/argocd >= v5 --- main.tf | 15 ++++++++++----- terraform.tf | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/main.tf b/main.tf index b15d88e7..9423c382 100644 --- a/main.tf +++ b/main.tf @@ -71,14 +71,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 756a358e..bb1636de 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" From 6579dd5a444bc2c551ff684ca288885f1013c819 Mon Sep 17 00:00:00 2001 From: lentidas Date: Mon, 10 Jul 2023 14:01:38 +0000 Subject: [PATCH 2/2] docs(terraform-docs): generate docs and write to README.adoc --- README.adoc | 12 ++++++------ aks/README.adoc | 8 ++++---- eks/README.adoc | 8 ++++---- kind/README.adoc | 8 ++++---- sks/README.adoc | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.adoc b/README.adoc index d3347852..e53d5d9f 100644 --- a/README.adoc +++ b/README.adoc @@ -23,7 +23,7 @@ Below you will only find the technical reference automatically generated from th The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_null]] <> (>= 3) @@ -39,7 +39,7 @@ The following providers are used by this module: - [[provider_utils]] <> (>= 1) -- [[provider_argocd]] <> (>= 4) +- [[provider_argocd]] <> (>= 5) - [[provider_null]] <> (>= 3) @@ -88,7 +88,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.1"` +Default: `"v1.1.0"` ==== [[input_cluster_issuer]] <> @@ -174,7 +174,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_random]] <> |>= 3 |[[requirement_utils]] <> |>= 1 @@ -188,7 +188,7 @@ Description: ID to pass other modules in order to refer to this module as a depe |[[provider_null]] <> |>= 3 |[[provider_random]] <> |>= 3 |[[provider_utils]] <> |>= 1 -|[[provider_argocd]] <> |>= 4 +|[[provider_argocd]] <> |>= 5 |=== = Resources @@ -230,7 +230,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.1.0"` |no |[[input_cluster_issuer]] <> diff --git a/aks/README.adoc b/aks/README.adoc index 9be25d06..29ce6c8a 100644 --- a/aks/README.adoc +++ b/aks/README.adoc @@ -207,7 +207,7 @@ This module has multiple ingresses and consequently it must be deployed after th The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_null]] <> (>= 3) @@ -289,7 +289,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.1"` +Default: `"v1.1.0"` ==== [[input_cluster_issuer]] <> @@ -375,7 +375,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_random]] <> |>= 3 |[[requirement_utils]] <> |>= 1 @@ -451,7 +451,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.1"` +|`"v1.1.0"` |no |[[input_cluster_issuer]] <> diff --git a/eks/README.adoc b/eks/README.adoc index a487d234..9d44374f 100644 --- a/eks/README.adoc +++ b/eks/README.adoc @@ -221,7 +221,7 @@ You need to add the OIDC module as a dependency, since OAuth2-Proxy is deployed The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_null]] <> (>= 3) @@ -287,7 +287,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.1"` +Default: `"v1.1.0"` ==== [[input_cluster_issuer]] <> @@ -373,7 +373,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_random]] <> |>= 3 |[[requirement_utils]] <> |>= 1 @@ -429,7 +429,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.1"` +|`"v1.1.0"` |no |[[input_cluster_issuer]] <> diff --git a/kind/README.adoc b/kind/README.adoc index 832cefaa..aa0791fc 100644 --- a/kind/README.adoc +++ b/kind/README.adoc @@ -153,7 +153,7 @@ This module requires a S3 bucket to store the metrics so it needs to be deployed The following requirements are needed by this module: -- [[requirement_argocd]] <> (>= 4) +- [[requirement_argocd]] <> (>= 5) - [[requirement_null]] <> (>= 3) @@ -221,7 +221,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.1"` +Default: `"v1.1.0"` ==== [[input_cluster_issuer]] <> @@ -307,7 +307,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_random]] <> |>= 3 |[[requirement_utils]] <> |>= 1 @@ -365,7 +365,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.1"` +|`"v1.1.0"` |no |[[input_cluster_issuer]] <> diff --git a/sks/README.adoc b/sks/README.adoc index 05232f26..3302bcb3 100644 --- a/sks/README.adoc +++ b/sks/README.adoc @@ -97,7 +97,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_null]] <> (>= 3) @@ -170,7 +170,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.1"` +Default: `"v1.1.0"` ==== [[input_cluster_issuer]] <> @@ -256,7 +256,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_random]] <> |>= 3 |[[requirement_utils]] <> |>= 1 @@ -319,7 +319,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.1"` +|`"v1.1.0"` |no |[[input_cluster_issuer]] <>