From 4326b49873b736a75b7c38e192a9b20d1cab9b10 Mon Sep 17 00:00:00 2001 From: Federico Sismondi Date: Wed, 15 May 2024 12:41:13 +0200 Subject: [PATCH 1/2] fix(repo_server): setting empty resources in terraform var should return empty resource value in yaml file --- variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variables.tf b/variables.tf index a4769afe..3f9f5e63 100644 --- a/variables.tf +++ b/variables.tf @@ -119,8 +119,8 @@ variable "resources" { repo_server = optional(object({ requests = optional(object({ - cpu = optional(string, "200m") - memory = optional(string, "128Mi") + cpu = optional(string) + memory = optional(string) }), {}) limits = optional(object({ cpu = optional(string) From 89c00486ee1d24f527238aca086d69a85b2c2697 Mon Sep 17 00:00:00 2001 From: fsismondi Date: Wed, 15 May 2024 10:41:42 +0000 Subject: [PATCH 2/2] docs(terraform-docs): generate docs and write to README.adoc --- README.adoc | 18 +++++++++--------- bootstrap/README.adoc | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.adoc b/README.adoc index a30ce6f2..a55b126e 100644 --- a/README.adoc +++ b/README.adoc @@ -223,8 +223,6 @@ The following requirements are needed by this module: The following providers are used by this module: -- [[provider_null]] <> (>= 3) - - [[provider_jwt]] <> (>= 1.1) - [[provider_time]] <> (>= 0.9) @@ -235,6 +233,8 @@ The following providers are used by this module: - [[provider_argocd]] <> (>= 5) +- [[provider_null]] <> (>= 3) + === Resources The following resources are used by this module: @@ -310,7 +310,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v4.4.0"` +Default: `"v4.4.1"` ==== [[input_cluster_issuer]] <> @@ -410,8 +410,8 @@ object({ repo_server = optional(object({ requests = optional(object({ - cpu = optional(string, "200m") - memory = optional(string, "128Mi") + cpu = optional(string) + memory = optional(string) }), {}) limits = optional(object({ cpu = optional(string) @@ -674,8 +674,8 @@ Description: Map of extra accounts that were created and their tokens. |[[provider_jwt]] <> |>= 1.1 |[[provider_time]] <> |>= 0.9 |[[provider_random]] <> |>= 3 -|[[provider_utils]] <> |>= 1.6 |[[provider_argocd]] <> |>= 5 +|[[provider_utils]] <> |>= 1.6 |=== = Resources @@ -731,7 +731,7 @@ Description: Map of extra accounts that were created and their tokens. |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v4.4.0"` +|`"v4.4.1"` |no |[[input_cluster_issuer]] <> @@ -828,8 +828,8 @@ object({ repo_server = optional(object({ requests = optional(object({ - cpu = optional(string, "200m") - memory = optional(string, "128Mi") + cpu = optional(string) + memory = optional(string) }), {}) limits = optional(object({ cpu = optional(string) diff --git a/bootstrap/README.adoc b/bootstrap/README.adoc index ddfbeba9..34009dbb 100644 --- a/bootstrap/README.adoc +++ b/bootstrap/README.adoc @@ -79,12 +79,12 @@ The following requirements are needed by this module: The following providers are used by this module: -- [[provider_random]] <> (>= 3) - - [[provider_jwt]] <> (>= 1.1) - [[provider_time]] <> (>= 0.9) +- [[provider_random]] <> (>= 3) + - [[provider_helm]] <> (>= 2) - [[provider_argocd]] <> (>= 6) @@ -201,9 +201,9 @@ Description: The Argo CD accounts pipeline tokens. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[provider_random]] <> |>= 3 |[[provider_jwt]] <> |>= 1.1 |[[provider_time]] <> |>= 0.9 +|[[provider_random]] <> |>= 3 |[[provider_helm]] <> |>= 2 |[[provider_argocd]] <> |>= 6 |[[provider_utils]] <> |>= 1.6