Merge branch 'main' into chore/argo-cd-notifications-links
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
commit
0b9fa8d90c
6 changed files with 8 additions and 8 deletions
|
@ -3,7 +3,7 @@ appVersion: v2.10.0
|
|||
kubeVersion: ">=1.23.0-0"
|
||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 6.0.8
|
||||
version: 6.0.10
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||
sources:
|
||||
|
|
|
@ -857,7 +857,7 @@ NAME: my-release
|
|||
| repoServer.service.annotations | object | `{}` | Repo server service annotations |
|
||||
| repoServer.service.labels | object | `{}` | Repo server service labels |
|
||||
| repoServer.service.port | int | `8081` | Repo server service port |
|
||||
| repoServer.service.portName | string | `"https-repo-server"` | Repo server service port name |
|
||||
| repoServer.service.portName | string | `"tcp-repo-server"` | Repo server service port name |
|
||||
| repoServer.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
|
||||
| repoServer.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
|
||||
| repoServer.serviceAccount.create | bool | `true` | Create repo server service account |
|
||||
|
@ -1361,7 +1361,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
|
|||
| applicationSet.service.annotations | object | `{}` | ApplicationSet service annotations |
|
||||
| applicationSet.service.labels | object | `{}` | ApplicationSet service labels |
|
||||
| applicationSet.service.port | int | `7000` | ApplicationSet service port |
|
||||
| applicationSet.service.portName | string | `"webhook"` | ApplicationSet service port name |
|
||||
| applicationSet.service.portName | string | `"http-webhook"` | ApplicationSet service port name |
|
||||
| applicationSet.service.type | string | `"ClusterIP"` | ApplicationSet service type |
|
||||
| applicationSet.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
|
||||
| applicationSet.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
|
||||
|
|
|
@ -22,7 +22,7 @@ spec:
|
|||
metadata:
|
||||
annotations:
|
||||
checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }}
|
||||
{{- if (hasKey .Values.server "configEnabled") | ternary .Values.server.configEnabled .Values.configs.cm.create }}
|
||||
{{- if .Values.configs.cm.create }}
|
||||
checksum/cm: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cm.yaml") . | sha256sum }}
|
||||
{{- end }}
|
||||
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.controller.podAnnotations) }}
|
||||
|
|
|
@ -30,7 +30,7 @@ spec:
|
|||
{{- if .Values.repoServer.certificateSecret.enabled }}
|
||||
checksum/repo-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-repo-server-tls-secret.yaml") . | sha256sum }}
|
||||
{{- end }}
|
||||
{{- if (hasKey .Values.server "configEnabled") | ternary .Values.server.configEnabled .Values.configs.cm.create }}
|
||||
{{- if .Values.configs.cm.create }}
|
||||
checksum/cm: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cm.yaml") . | sha256sum }}
|
||||
{{- end }}
|
||||
{{- if .Values.configs.cmp.create }}
|
||||
|
|
|
@ -42,7 +42,7 @@ rules:
|
|||
verbs:
|
||||
- create
|
||||
- list
|
||||
{{- if eq (toString (index (coalesce .Values.server.config .Values.configs.cm) "exec.enabled")) "true" }}
|
||||
{{- if eq (toString (index .Values.configs.cm "exec.enabled")) "true" }}
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
|
|
|
@ -2455,7 +2455,7 @@ repoServer:
|
|||
# -- Repo server service port
|
||||
port: 8081
|
||||
# -- Repo server service port name
|
||||
portName: https-repo-server
|
||||
portName: tcp-repo-server
|
||||
|
||||
## Repo server metrics service configuration
|
||||
metrics:
|
||||
|
@ -2661,7 +2661,7 @@ applicationSet:
|
|||
# -- ApplicationSet service port
|
||||
port: 7000
|
||||
# -- ApplicationSet service port name
|
||||
portName: webhook
|
||||
portName: http-webhook
|
||||
|
||||
serviceAccount:
|
||||
# -- Create ApplicationSet controller service account
|
||||
|
|
Loading…
Reference in a new issue