Merge branch 'update-events' of github.com:nouseforaname/argo-helm into update-events

This commit is contained in:
konstantin.kiess 2020-01-29 12:54:48 +01:00
commit 24bce200bd
5 changed files with 16 additions and 8 deletions

View file

@ -1,8 +1,8 @@
apiVersion: v1
appVersion: "1.3.6"
appVersion: "1.4.1"
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 1.6.3
version: 1.7.0
home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords:

View file

@ -36,11 +36,13 @@ 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.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. |
| 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 | `""` |

View file

@ -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 }}

View file

@ -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" . }}

View file

@ -10,7 +10,7 @@ installCRDs: true
global:
image:
repository: argoproj/argocd
tag: v1.3.6
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
@ -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"