From 27170d1f70455b85ee15ee478f8cc115268723d9 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Tue, 17 Sep 2019 03:42:03 -0400 Subject: [PATCH] Bump version to 1.21 (#108) --- charts/argo-cd/README.md | 1 + charts/argo-cd/templates/argocd-cm.yaml | 3 +++ charts/argo-cd/values.yaml | 10 +++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 28f08c73..62171767 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -39,6 +39,7 @@ $ helm install --name my-release argo/argo-cd | config.repositories | string | `nil` | Configuration for remote Git repositories for Applications, see [values.yaml](./values.yaml) for format | | config.resourceCustomizations | string | `nil` | resourceCustomizations can be used to create custom health checks for resources [https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/health.md#way-1-define-a-custom-health-check-in-argocd-cm-configmap] | | config.url | string | `nil` | External URL for ArgoCD | +| config.instanceLabelKey | string | `nil` | Custom instance label key | | 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 | diff --git a/charts/argo-cd/templates/argocd-cm.yaml b/charts/argo-cd/templates/argocd-cm.yaml index 98467bb8..9dd30561 100755 --- a/charts/argo-cd/templates/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-cm.yaml @@ -24,6 +24,9 @@ data: {{- if .Values.config.url }} url: {{ .Values.config.url }} {{- end }} +{{- if .Values.config.instanceLabelKey }} + application.instanceLabelKey: {{ .Values.config.instanceLabelKey }} +{{- end }} {{- if .Values.config.oidcConfig }} oidc.config: | {{ toYaml .Values.config.oidcConfig | indent 4 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 8eabbeca..167c7f13 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3,7 +3,7 @@ applicationController: servicePort: 8082 image: repository: argoproj/argocd - tag: v1.2.0 + tag: v1.2.1 pullPolicy: Always volumeMounts: [] volumes: [] @@ -16,7 +16,7 @@ server: serviceAnnotations: {} image: repository: argoproj/argocd - tag: v1.2.0 + tag: v1.2.1 pullPolicy: Always serviceType: ClusterIP extraArgs: [] @@ -34,7 +34,7 @@ repoServer: servicePort: 8081 image: repository: argoproj/argocd - tag: v1.2.0 + tag: v1.2.1 pullPolicy: Always volumeMounts: [] volumes: [] @@ -46,11 +46,11 @@ dexServer: servicePortGrpc: 5557 image: repository: quay.io/dexidp/dex - tag: v2.12.0 + tag: v2.14.0 pullPolicy: Always initImage: repository: argoproj/argocd - tag: v1.2.0 + tag: v1.2.1 pullPolicy: Always volumeMounts: [] volumes: []