From 3776b30e2a2bf1be80bbd28cdc01e561742dc590 Mon Sep 17 00:00:00 2001 From: pashakostohrys Date: Wed, 4 Oct 2023 13:29:50 +0300 Subject: [PATCH 1/3] feat: update argocd to v2.8.1-cap-CR-not-setup-kustomize-ns version --- charts/argo-cd/Chart.yaml | 6 +++--- charts/argo-cd/values.yaml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 9bb1c64a..f3a562ba 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: v2.8.1-cap-CR-player-and-vuln-fix +appVersion: v2.8.1-cap-CR-not-setup-kustomize-ns kubeVersion: ">=1.23.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.46.2-2-cap-CR-player-and-vuln-fix +version: 5.46.2-3-cap-CR-not-setup-kustomize-ns home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -27,4 +27,4 @@ annotations: url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - kind: changed - description: Update ArgoCD version to v2.8.1-cap-CR-player-and-vuln-fix + description: Update ArgoCD version to v2.8.1-cap-CR-not-setup-kustomize-ns diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index f54e6889..50a4ee6e 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -172,6 +172,9 @@ configs: ## Ref: https://argo-cd.readthedocs.io/en/latest/operator-manual/rbac/#exec-resource exec.enabled: false + # -- Enable set namespace during kustomize build + kustomize.setNamespace.enabled: false + # -- Enable local admin user ## Ref: https://argo-cd.readthedocs.io/en/latest/faq/#how-to-disable-admin-user admin.enabled: true From 74766d4b400c090ac22e0beb60d3a75da2a0c2d9 Mon Sep 17 00:00:00 2001 From: pashakostohrys Date: Wed, 4 Oct 2023 13:34:58 +0300 Subject: [PATCH 2/3] add kustomize.setNamespace.enabled param in readme --- charts/argo-cd/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 982ee13d..3e3e4c38 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -436,6 +436,7 @@ NAME: my-release | configs.cm."admin.enabled" | bool | `true` | Enable local admin user | | configs.cm."application.instanceLabelKey" | string | Defaults to app.kubernetes.io/instance | The name of tracking label used by Argo CD for resource pruning | | configs.cm."exec.enabled" | bool | `false` | Enable exec feature in Argo UI | +| configs.cm."kustomize.setNamespace.enabled" | bool | `true` | Enable set namespace during kustomize build | | configs.cm."server.rbac.log.enforce.enable" | bool | `false` | Enable logs RBAC enforcement | | configs.cm."timeout.hard.reconciliation" | string | `"0s"` | Timeout to refresh application data as well as target manifests cache | | configs.cm."timeout.reconciliation" | string | `"180s"` | Timeout to discover if a new manifests version got published to the repository | From 61b50b1adc7068b3b89c87afd7b85b2e8dfa909f Mon Sep 17 00:00:00 2001 From: pashakostohrys Date: Wed, 4 Oct 2023 13:37:02 +0300 Subject: [PATCH 3/3] add kustomize.setNamespace.enabled param in readme --- charts/argo-cd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 3e3e4c38..7c35ff9d 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -436,7 +436,7 @@ NAME: my-release | configs.cm."admin.enabled" | bool | `true` | Enable local admin user | | configs.cm."application.instanceLabelKey" | string | Defaults to app.kubernetes.io/instance | The name of tracking label used by Argo CD for resource pruning | | configs.cm."exec.enabled" | bool | `false` | Enable exec feature in Argo UI | -| configs.cm."kustomize.setNamespace.enabled" | bool | `true` | Enable set namespace during kustomize build | +| configs.cm."kustomize.setNamespace.enabled" | bool | `false` | Enable set namespace during kustomize build | | configs.cm."server.rbac.log.enforce.enable" | bool | `false` | Enable logs RBAC enforcement | | configs.cm."timeout.hard.reconciliation" | string | `"0s"` | Timeout to refresh application data as well as target manifests cache | | configs.cm."timeout.reconciliation" | string | `"180s"` | Timeout to discover if a new manifests version got published to the repository |