Merge remote-tracking branch 'upstream/master' into AllowCustomPathsForServerIngress
This commit is contained in:
commit
0c7c47a126
12 changed files with 72 additions and 8 deletions
|
@ -7,7 +7,7 @@
|
||||||
/charts/argo-events @jbehling
|
/charts/argo-events @jbehling
|
||||||
|
|
||||||
# Argo Workflows
|
# Argo Workflows
|
||||||
/charts/argo @benjaminws
|
/charts/argo @benjaminws @stefansedich
|
||||||
|
|
||||||
# Argo Rollouts
|
# Argo Rollouts
|
||||||
/charts/argo-rollouts @cabrinha
|
/charts/argo-rollouts @cabrinha
|
||||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
||||||
appVersion: "1.5.2"
|
appVersion: "1.5.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: 2.2.8
|
version: 2.2.11
|
||||||
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:
|
||||||
|
|
|
@ -19,9 +19,8 @@ This chart currently installs the non-HA version of ArgoCD.
|
||||||
`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are not arrays of strings intead of a map
|
`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are not arrays of strings intead of a map
|
||||||
|
|
||||||
What was
|
What was
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
controller:
|
server:
|
||||||
extraArgs:
|
extraArgs:
|
||||||
insecure: ""
|
insecure: ""
|
||||||
```
|
```
|
||||||
|
@ -29,7 +28,7 @@ controller:
|
||||||
is now
|
is now
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
controller:
|
server:
|
||||||
extraArgs:
|
extraArgs:
|
||||||
- --insecure
|
- --insecure
|
||||||
```
|
```
|
||||||
|
@ -79,6 +78,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
||||||
| configs.secret.gitlabSecret | GitLab incoming webhook secret | `""` |
|
| configs.secret.gitlabSecret | GitLab incoming webhook secret | `""` |
|
||||||
| configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) |
|
| configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) |
|
||||||
| configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` |
|
| configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` |
|
||||||
|
| openshift.enabled | enables using arbitrary uid for argo repo server | `false` |
|
||||||
|
|
||||||
## ArgoCD Controller
|
## ArgoCD Controller
|
||||||
|
|
||||||
|
@ -183,6 +183,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
||||||
| server.autoscaling.maxReplicas | Maximum number of replicas for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `5` |
|
| server.autoscaling.maxReplicas | Maximum number of replicas for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `5` |
|
||||||
| server.autoscaling.targetCPUUtilizationPercentage | Average CPU utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` |
|
| server.autoscaling.targetCPUUtilizationPercentage | Average CPU utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` |
|
||||||
| server.autoscaling.targetMemoryUtilizationPercentage | Average memory utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` |
|
| server.autoscaling.targetMemoryUtilizationPercentage | Average memory utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` |
|
||||||
|
| server.GKEbackendConfig.enabled | Enable BackendConfig custom resource for Google Kubernetes Engine. | `false` |
|
||||||
|
| server.GKEbackendConfig.spec | [BackendConfigSpec](https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom) | `{}` |
|
||||||
| server.certificate.additionalHosts | Certificate manager additional hosts | `[]` |
|
| server.certificate.additionalHosts | Certificate manager additional hosts | `[]` |
|
||||||
| server.certificate.domain | Certificate manager domain | `"argocd.example.com"` |
|
| server.certificate.domain | Certificate manager domain | `"argocd.example.com"` |
|
||||||
| server.certificate.enabled | Enables a certificate manager certificate. | `false` |
|
| server.certificate.enabled | Enables a certificate manager certificate. | `false` |
|
||||||
|
|
|
@ -52,10 +52,10 @@ spec:
|
||||||
image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }}
|
image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }}
|
||||||
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
|
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
|
||||||
command:
|
command:
|
||||||
- argocd-repo-server
|
|
||||||
{{- if .Values.openshift.enabled }}
|
{{- if .Values.openshift.enabled }}
|
||||||
- uid_entrypoint.sh
|
- uid_entrypoint.sh
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
- argocd-repo-server
|
||||||
{{- 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) }}
|
||||||
- --redis
|
- --redis
|
||||||
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
|
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
|
||||||
|
|
15
charts/argo-cd/templates/argocd-server/backendconfig.yaml
Normal file
15
charts/argo-cd/templates/argocd-server/backendconfig.yaml
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{{- if .Values.server.GKEbackendConfig.enabled }}
|
||||||
|
apiVersion: cloud.google.com/v1beta1
|
||||||
|
kind: BackendConfig
|
||||||
|
metadata:
|
||||||
|
name: {{ template "argo-cd.server.fullname" . }}
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
|
||||||
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
|
app.kubernetes.io/part-of: argocd
|
||||||
|
app.kubernetes.io/component: {{ .Values.server.name }}
|
||||||
|
spec:
|
||||||
|
{{- toYaml .Values.server.GKEbackendConfig.spec | nindent 2 }}
|
||||||
|
{{- end }}
|
|
@ -561,6 +561,16 @@ server:
|
||||||
clusterAdminAccess:
|
clusterAdminAccess:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
|
## Enable BackendConfig custom resource for Google Kubernetes Engine
|
||||||
|
GKEbackendConfig:
|
||||||
|
enabled: false
|
||||||
|
spec: {}
|
||||||
|
# spec:
|
||||||
|
# iap:
|
||||||
|
# enabled: true
|
||||||
|
# oauthclientCredentials:
|
||||||
|
# secretName: argocd-secret
|
||||||
|
|
||||||
## Repo Server
|
## Repo Server
|
||||||
repoServer:
|
repoServer:
|
||||||
name: repo-server
|
name: repo-server
|
||||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
||||||
appVersion: "v2.6.1"
|
appVersion: "v2.6.1"
|
||||||
description: A Helm chart for Argo Workflows
|
description: A Helm chart for Argo Workflows
|
||||||
name: argo
|
name: argo
|
||||||
version: 0.8.0
|
version: 0.8.2
|
||||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
maintainers:
|
maintainers:
|
||||||
|
|
|
@ -28,12 +28,23 @@ rules:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
|
{{- if .Values.controller.persistence }}
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
- secrets
|
- secrets
|
||||||
|
resourceNames:
|
||||||
|
{{- if .Values.controller.persistence.postgresql }}
|
||||||
|
- {{ .Values.controller.persistence.postgresql.userNameSecret.name }}
|
||||||
|
- {{ .Values.controller.persistence.postgresql.passwordSecret.name }}
|
||||||
|
{{- end}}
|
||||||
|
{{- if .Values.controller.persistence.mysql }}
|
||||||
|
- {{ .Values.controller.persistence.mysql.userNameSecret.name }}
|
||||||
|
- {{ .Values.controller.persistence.mysql.passwordSecret.name }}
|
||||||
|
{{- end}}
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
|
{{- end}}
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- argoproj.io
|
- argoproj.io
|
||||||
resources:
|
resources:
|
||||||
|
|
|
@ -31,6 +31,7 @@ spec:
|
||||||
- name: argo-server
|
- name: argo-server
|
||||||
args:
|
args:
|
||||||
- server
|
- server
|
||||||
|
- --configmap={{ .Release.Name }}-{{ .Values.controller.name }}-configmap
|
||||||
{{- if .Values.server.extraArgs }}
|
{{- if .Values.server.extraArgs }}
|
||||||
{{- toYaml .Values.server.extraArgs | nindent 10 }}
|
{{- toYaml .Values.server.extraArgs | nindent 10 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -78,4 +78,22 @@ rules:
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
|
{{- if .Values.controller.persistence }}
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- secrets
|
||||||
|
resourceNames:
|
||||||
|
{{- if .Values.controller.persistence.postgresql }}
|
||||||
|
- {{ .Values.controller.persistence.postgresql.userNameSecret.name }}
|
||||||
|
- {{ .Values.controller.persistence.postgresql.passwordSecret.name }}
|
||||||
|
{{- end}}
|
||||||
|
{{- if .Values.controller.persistence.mysql }}
|
||||||
|
- {{ .Values.controller.persistence.mysql.userNameSecret.name }}
|
||||||
|
- {{ .Values.controller.persistence.mysql.passwordSecret.name }}
|
||||||
|
{{- end}}
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
{{- end}}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -49,3 +49,6 @@ data:
|
||||||
{{- if .Values.controller.persistence }}
|
{{- if .Values.controller.persistence }}
|
||||||
persistence:
|
persistence:
|
||||||
{{ toYaml .Values.controller.persistence | indent 6 }}{{- end }}
|
{{ toYaml .Values.controller.persistence | indent 6 }}{{- end }}
|
||||||
|
{{- if .Values.controller.workflowDefaults }}
|
||||||
|
workflowDefaults:
|
||||||
|
{{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }}
|
||||||
|
|
|
@ -4,7 +4,7 @@ images:
|
||||||
server: argocli
|
server: argocli
|
||||||
executor: argoexec
|
executor: argoexec
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
tag: v2.6.1
|
tag: v2.7.6
|
||||||
|
|
||||||
crdVersion: v1alpha1
|
crdVersion: v1alpha1
|
||||||
installCRD: true
|
installCRD: true
|
||||||
|
@ -47,6 +47,10 @@ controller:
|
||||||
# passwordSecret:
|
# passwordSecret:
|
||||||
# name: argo-postgres-config
|
# name: argo-postgres-config
|
||||||
# key: password
|
# key: password
|
||||||
|
workflowDefaults: {} # Only valid for 2.7+
|
||||||
|
# spec:
|
||||||
|
# ttlStrategy:
|
||||||
|
# secondsAfterCompletion: 84600
|
||||||
telemetryConfig:
|
telemetryConfig:
|
||||||
enabled: false
|
enabled: false
|
||||||
path: /telemetry
|
path: /telemetry
|
||||||
|
|
Loading…
Reference in a new issue