From 45f03a13f831cfce75c3cccb15e58663f8607fd4 Mon Sep 17 00:00:00 2001 From: Bruno Clermont Date: Wed, 22 Jan 2020 06:17:21 +0800 Subject: [PATCH 1/4] feat: Update argo-cd image to version v1.4.0 (#210) --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 2 +- charts/argo-cd/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index ce668df5..24464bc2 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.3.6" +appVersion: "1.4.0" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.6.3 +version: 1.6.4 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 614f2eb9..861ba878 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -36,7 +36,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i |-----|------|---------| | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | -| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.3.6"` | +| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.0"` | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |  | nameOverride | Provide a name in place of `argocd` | `"argocd"` | | installCRDs | bool | `true` | Install CRDs if you are using Helm2. | diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 0d4ae2de..18a30d72 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: argoproj/argocd - tag: v1.3.6 + tag: v1.4.0 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 From 3764b5e4c78c48be832c605113c0ced5c021b91c Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Thu, 23 Jan 2020 23:25:21 +0100 Subject: [PATCH 2/4] feat: Bump to version 1.4.1 (#214) Signed-off-by: David J. M. Karlsen --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 2 +- charts/argo-cd/values.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 24464bc2..699fb9d9 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.4.0" +appVersion: "1.4.1" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.6.4 +version: 1.6.5 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 861ba878..dc043caa 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -36,7 +36,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i |-----|------|---------| | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | -| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.0"` | +| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.1"` | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |  | nameOverride | Provide a name in place of `argocd` | `"argocd"` | | installCRDs | bool | `true` | Install CRDs if you are using Helm2. | diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 18a30d72..3e21ab78 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: argoproj/argocd - tag: v1.4.0 + tag: v1.4.1 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 @@ -23,7 +23,7 @@ controller: image: repository: # argoproj/argocd - tag: # v1.3.6 + tag: # v1.4.1 imagePullPolicy: # IfNotPresent ## Argo controller commandline flags @@ -270,7 +270,7 @@ server: image: repository: # argoproj/argocd - tag: # v1.3.6 + tag: # v1.4.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-server @@ -511,7 +511,7 @@ repoServer: image: repository: # argoproj/argocd - tag: # v1.3.6 + tag: # v1.4.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-repo-server From 8c37cd37dba02049992bc47a73bb474150d7e6cb Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Mon, 27 Jan 2020 23:07:35 +0100 Subject: [PATCH 3/4] fix: update certificate apiVersion (#213) --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/certificate.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 699fb9d9..852c75cc 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.4.1" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.6.5 +version: 1.6.6 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-server/certificate.yaml b/charts/argo-cd/templates/argocd-server/certificate.yaml index 246519f6..bc90305a 100644 --- a/charts/argo-cd/templates/argocd-server/certificate.yaml +++ b/charts/argo-cd/templates/argocd-server/certificate.yaml @@ -1,5 +1,9 @@ {{- if .Values.server.certificate.enabled -}} +{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }} +apiVersion: cert-manager.io/v1alpha2 +{{- else }} apiVersion: certmanager.k8s.io/v1alpha1 +{{- end }} kind: Certificate metadata: name: {{ template "argo-cd.server.fullname" . }} From 8ec26c796872007a2742a7ec8889608270a0f9ef Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Mon, 27 Jan 2020 23:28:58 +0100 Subject: [PATCH 4/4] feat: allow manually setting password modification time (#207) Automatically setting password modification time to the current time leads to it changing every time the chart is rendered. Ironically, this is a problem when Argo CD manages itself using this chart ;-) --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 ++ charts/argo-cd/templates/argocd-configs/argocd-secret.yaml | 2 +- charts/argo-cd/values.yaml | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 852c75cc..54b95a9f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.4.1" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.6.6 +version: 1.7.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index dc043caa..5e87de3e 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -41,6 +41,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | nameOverride | Provide a name in place of `argocd` | `"argocd"` | | installCRDs | bool | `true` | Install CRDs if you are using Helm2. | | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) | +| configs.secret.argocdServerAdminPassword | Admin password | `null` | +| configs.secret.argocdServerAdminPasswordMtime | Admin password modification time | `date "2006-01-02T15:04:05Z" now` if configs.secret.argocdServerAdminPassword is set | | configs.secret.bitbucketSecret | BitBucket incoming webhook secret | `""` | | configs.secret.createSecret | Create the argocd-secret. | `true` | | configs.secret.githubSecret | GitHub incoming webhook secret | `""` | diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml index f9036347..ad8da483 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml @@ -35,7 +35,7 @@ data: {{- end }} {{- if .Values.configs.secret.argocdServerAdminPassword }} admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }} - admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }} + admin.passwordMtime: {{ default (date "2006-01-02T15:04:05Z" now) .Values.configs.secret.argocdServerAdminPasswordMtime | b64enc }} {{- end }} {{- range $key, $value := .Values.configs.secret.extra }} {{ $key }}: {{ $value | b64enc }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 3e21ab78..6cc7a43c 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -742,3 +742,5 @@ configs: # Argo expects the password in the secret to be bcrypt hashed. You can create this hash with # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'` # argocdServerAdminPassword: + # Password modification time defaults to current time if not set + # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"