Merge branch 'master' into cronworkflow-crd

This commit is contained in:
Chris Sng 2020-02-06 10:13:40 +08:00 committed by GitHub
commit 553a14fb72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 9 deletions

View file

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

View file

@ -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.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.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.1"` | | global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.2"` |
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |  | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | 
| nameOverride | Provide a name in place of `argocd` | `"argocd"` | | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
| installCRDs | bool | `true` | Install CRDs if you are using Helm2. | | installCRDs | bool | `true` | Install CRDs if you are using Helm2. |

View file

@ -16,7 +16,7 @@ spec:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
revisionHistoryLimit: 5 revisionHistoryLimit: 5
replicas: 1 replicas: {{ .Values.repoServer.replicas }}
template: template:
metadata: metadata:
{{- if .Values.repoServer.podAnnotations }} {{- if .Values.repoServer.podAnnotations }}

View file

@ -16,7 +16,7 @@ spec:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
revisionHistoryLimit: 5 revisionHistoryLimit: 5
replicas: 1 replicas: {{ .Values.server.replicas }}
template: template:
metadata: metadata:
{{- if .Values.server.podAnnotations }} {{- if .Values.server.podAnnotations }}

View file

@ -10,7 +10,7 @@ installCRDs: true
global: global:
image: image:
repository: argoproj/argocd repository: argoproj/argocd
tag: v1.4.1 tag: v1.4.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext: {} securityContext: {}
# runAsUser: 999 # runAsUser: 999
@ -23,7 +23,7 @@ controller:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.4.1 tag: # v1.4.2
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Argo controller commandline flags ## Argo controller commandline flags
@ -268,9 +268,11 @@ redis:
server: server:
name: server name: server
replicas: 1
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.4.1 tag: # v1.4.2
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-server ## Additional command line arguments to pass to argocd-server
@ -509,9 +511,11 @@ server:
repoServer: repoServer:
name: repo-server name: repo-server
replicas: 1
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.4.1 tag: # v1.4.2
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-repo-server ## Additional command line arguments to pass to argocd-repo-server