Merge branch 'master' into feat-conditional-server-service-account-creation

This commit is contained in:
Vlad Losev 2020-10-05 09:43:00 -07:00 committed by GitHub
commit 484b5b1708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 3 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.7.6 appVersion: 1.7.6
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: 2.7.4 version: 2.8.0
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

@ -62,7 +62,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.6.1"` | | global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.7.6"` |
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
| global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |
| global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |

View file

@ -56,6 +56,8 @@ spec:
- {{ .Values.controller.args.appResyncPeriod | quote }} - {{ .Values.controller.args.appResyncPeriod | quote }}
- --repo-server - --repo-server
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }} - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
- --logformat
- {{ .Values.controller.logFormat }}
- --loglevel - --loglevel
- {{ .Values.controller.logLevel }} - {{ .Values.controller.logLevel }}
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }} {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}

View file

@ -60,6 +60,8 @@ spec:
- --redis - --redis
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }} - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
{{- end }} {{- end }}
- --logformat
- {{ .Values.repoServer.logFormat }}
- --loglevel - --loglevel
- {{ .Values.repoServer.logLevel }} - {{ .Values.repoServer.logLevel }}
{{- with .Values.repoServer.extraArgs }} {{- with .Values.repoServer.extraArgs }}

View file

@ -1,5 +1,7 @@
{{- if .Values.server.certificate.enabled -}} {{- if .Values.server.certificate.enabled -}}
{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }} {{- if .Capabilities.APIVersions.Has "cert-manager.io/v1" }}
apiVersion: cert-manager.io/v1
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }}
apiVersion: cert-manager.io/v1alpha3 apiVersion: cert-manager.io/v1alpha3
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }} {{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }}
apiVersion: cert-manager.io/v1alpha2 apiVersion: cert-manager.io/v1alpha2

View file

@ -61,6 +61,8 @@ spec:
- --dex-server - --dex-server
- http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }} - http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
{{- end }} {{- end }}
- --logformat
- {{ .Values.server.logFormat }}
- --loglevel - --loglevel
- {{ .Values.server.logLevel }} - {{ .Values.server.logLevel }}
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }} {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}

View file

@ -37,6 +37,8 @@ controller:
operationProcessors: "10" operationProcessors: "10"
appResyncPeriod: "180" appResyncPeriod: "180"
## Argo controller log format: text|json
logFormat: text
## Argo controller log level ## Argo controller log level
logLevel: info logLevel: info
@ -352,6 +354,8 @@ server:
## ##
env: [] env: []
## Argo server log format: text|json
logFormat: text
## Argo server log level ## Argo server log level
logLevel: info logLevel: info
@ -675,6 +679,8 @@ repoServer:
## ##
env: [] env: []
## Argo repoServer log format: text|json
logFormat: text
## Argo repoServer log level ## Argo repoServer log level
logLevel: info logLevel: info