From 33814a7a026bfa04ff123d8c7d1e3d9adb5fa15a Mon Sep 17 00:00:00 2001 From: Federico Sismondi Date: Mon, 11 Mar 2024 17:03:56 +0100 Subject: [PATCH 1/2] feat(plugins): set loglevel to warning on helmfile and kustomize --- locals.tf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/locals.tf b/locals.tf index 63c27533..37446ceb 100644 --- a/locals.tf +++ b/locals.tf @@ -52,6 +52,7 @@ locals { command = ["/var/run/argocd/argocd-cmp-server"] # Note: Argo CD official image ships Helm and Kustomize. No need to build a custom image to use "kustomized-helm" plugin. image = "quay.io/argoproj/argocd:${local.argocd_version}" + args = ["--loglevel=warn"] securityContext = { runAsNonRoot = true runAsUser = 999 @@ -75,7 +76,7 @@ locals { name = "kustomized-helm-cmp-tmp" } ] - # The extra containers of the repo_server pod must have resource requests/limits in order to allow this component + # The extra containers of the repo_server pod must have resource requests/limits in order to allow this component # to autoscale properly. resources = var.resources.repo_server # TODO Maybe this resources should be different from the repo_server one. }, @@ -83,6 +84,7 @@ locals { name = "helmfile-cmp" command = ["/var/run/argocd/argocd-cmp-server"] image = "ghcr.io/camptocamp/docker-argocd-cmp-helmfile:${var.helmfile_cmp_version}" + args = ["--loglevel=warn"] env = var.helmfile_cmp_env_variables securityContext = { runAsNonRoot = true @@ -104,7 +106,7 @@ locals { name = "helmfile-cmp-tmp" } ] - # The extra containers of the repo_server pod must have resource requests/limits in order to allow this component + # The extra containers of the repo_server pod must have resource requests/limits in order to allow this component # to autoscale properly. resources = var.resources.repo_server # TODO Maybe this resources should be different from the repo_server one. } From 4a68770ba2a6bb43a53e3748a90461f75e25d958 Mon Sep 17 00:00:00 2001 From: fsismondi Date: Mon, 11 Mar 2024 16:04:22 +0000 Subject: [PATCH 2/2] docs(terraform-docs): generate docs and write to README.adoc --- README.adoc | 8 ++++---- bootstrap/README.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.adoc b/README.adoc index c60c4142..97c67425 100644 --- a/README.adoc +++ b/README.adoc @@ -223,6 +223,8 @@ 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) @@ -233,8 +235,6 @@ The following providers are used by this module: - [[provider_argocd]] <> (>= 5) -- [[provider_null]] <> (>= 3) - === Resources The following resources are used by this module: @@ -302,7 +302,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v3.5.2"` +Default: `"v4.0.0"` ==== [[input_cluster_issuer]] <> @@ -715,7 +715,7 @@ Description: Map of extra accounts that were created and their tokens. |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v3.5.2"` +|`"v4.0.0"` |no |[[input_cluster_issuer]] <> diff --git a/bootstrap/README.adoc b/bootstrap/README.adoc index d05f3e4f..58c5bf55 100644 --- a/bootstrap/README.adoc +++ b/bootstrap/README.adoc @@ -203,9 +203,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