From c69027c5355ca1fb04db6a3b1da43d0dca93a6d4 Mon Sep 17 00:00:00 2001 From: AntoineDao Date: Tue, 12 Nov 2019 14:16:15 +1000 Subject: [PATCH] argo-cd: fix statusbadge option to chart --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 +- charts/argo-cd/templates/argocd-cm.yaml | 4 +--- charts/argo-cd/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index ad378c16..3c2c70dc 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.2.5" description: A Helm chart for Argo-CD name: argo-cd -version: 1.0.6 +version: 1.0.7 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index a0a7fddb..add6d584 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -52,7 +52,7 @@ $ helm install --name my-release argo/argo-cd | config.webhook.bitbucketSecret | string | `nil` | BitBucket incoming webhook secret | | config.webhook.githubSecret | string | `nil` | GitHub incoming webhook secret | | config.webhook.gitlabSecret | string | `nil` | GitLab incoming webhook secret | -| config.statusbadge.enabled | bool | `nil` | Toggle to enable status badges in argocd-cm | +| config.statusbadge.enabled | bool | `false` | Toggle to enable status badges in argocd-cm | | dexServer.containerPortGrpc | int | `5557` | Container port for Dex Server GRPC | | dexServer.containerPortHttp | int | `5556` | Container port for Dex Server HTTP | | dexServer.image.pullPolicy | string | `"Always"` | Docker image pull policy | diff --git a/charts/argo-cd/templates/argocd-cm.yaml b/charts/argo-cd/templates/argocd-cm.yaml index 5f9170cb..15c08299 100644 --- a/charts/argo-cd/templates/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-cm.yaml @@ -45,7 +45,5 @@ data: {{- if .Values.config.configManagementPlugins }} configManagementPlugins: | {{ toYaml .Values.config.configManagementPlugins | indent 4 }} -{{ -if .Values.config.statusbadge.enabled }} - statusbadge.enabled: "true" -{{ - end }} + statusbadge.enabled: "{{ .Values.config.statusbadge.enabled }}" {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 5fbf7fe3..7b375fd5 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -319,6 +319,8 @@ server: url: https://argocd.example.com # Argo CD instance label key application.instanceLabelKey: argocd.argoproj.io/instance + # Argo CD status badge feature flag + statusbadge.enabled: false ## ArgoCD rbac config ## reference https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md