argoproj
/
argo-helm
mirror of https://github.com/argoproj/argo-helm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

feat(argo-cd): Upgrade Argo CD to 2.5.0 (#1568) 

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
pull/1575/head argo-cd-5.8.0
Petr Drastil 2022-10-25 23:22:22 +02:00 committed by GitHub
parent c8f7efb68f
commit 7e30521dd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 451 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charts/argo-cd/Chart.yaml
View File

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
appVersion: v2.4.15 appVersion: v2.5.0
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 5.7.0 version: 5.8.0
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:
@ -22,6 +22,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Added]: Configuration sections configs.cm and configs.rbac" - "[Changed]: Upgraded Argo CD to 2.5.0"
- "[Deprecated]: Generic configuration via server.config"
- "[Deprecated]: Argo RBAC configuration via server.rbacConfig"

13
charts/argo-cd/templates/_helpers.tpl
View File

@ -15,6 +15,17 @@ Create dex name and version as used by the chart label.
{{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.dex.name | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.dex.name | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{/*
Create Dex server endpoint
*/}}
{{- define "argo-cd.dex.server" -}}
{{- $insecure := index .Values.configs.params "dexserver.disable.tls" | toString -}}
{{- $scheme := (eq $insecure "true") | ternary "http" "https" -}}
{{- $host := include "argo-cd.dex.fullname" . -}}
{{- $port := int .Values.dex.servicePortHttp -}}
{{- printf "%s://%s:%d" $scheme $host $port }}
{{- end }}
{{/* {{/*
Create redis name and version as used by the chart label. Create redis name and version as used by the chart label.
*/}} */}}
@ -185,7 +196,7 @@ repo.server: "{{ include "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServe
redis.server: {{ . | quote }} redis.server: {{ . | quote }}
{{- end }} {{- end }}
{{- if .Values.dex.enabled }} {{- if .Values.dex.enabled }}
server.dex.server: "http://{{ include "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}" server.dex.server: {{ include "argo-cd.dex.server" . }}
{{- end }} {{- end }}
{{- range $component := tuple "controller" "server" "reposerver" }} {{- range $component := tuple "controller" "server" "reposerver" }}
{{ $component }}.log.format: {{ $.Values.global.logging.format | quote }} {{ $component }}.log.format: {{ $.Values.global.logging.format | quote }}

57
charts/argo-cd/templates/argocd-application-controller/statefulset.yaml
View File

@ -163,6 +163,12 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: controller.repo.server.strict.tls key: controller.repo.server.strict.tls
optional: true optional: true
- name: ARGOCD_APPLICATION_CONTROLLER_PERSIST_RESOURCE_HEALTH
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: controller.resource.health.persist
optional: true
- name: ARGOCD_APP_STATE_CACHE_EXPIRATION - name: ARGOCD_APP_STATE_CACHE_EXPIRATION
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
@ -175,6 +181,12 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: redis.server key: redis.server
optional: true optional: true
- name: REDIS_COMPRESSION
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: redis.compression
optional: true
- name: REDISDB - name: REDISDB
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
@ -205,6 +217,12 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: otlp.address key: otlp.address
optional: true optional: true
- name: ARGOCD_APPLICATION_NAMESPACES
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: application.namespaces
optional: true
{{- with .Values.controller.envFrom }} {{- with .Values.controller.envFrom }}
envFrom: envFrom:
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
@ -216,31 +234,32 @@ spec:
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz
port: {{ .Values.controller.containerPort }} port: metrics
initialDelaySeconds: {{ .Values.controller.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.controller.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.controller.livenessProbe.periodSeconds }} periodSeconds: {{ .Values.controller.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.controller.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.controller.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.livenessProbe.successThreshold }} successThreshold: {{ .Values.controller.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }}
readinessProbe: readinessProbe:
tcpSocket: httpGet:
port: {{ .Values.controller.containerPort }} path: /healthz
port: metrics
initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }} periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }} successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }} failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
workingDir: /home/argocd
volumeMounts:
- name: argocd-home
mountPath: /home/argocd
- mountPath: /app/config/controller/tls
name: argocd-repo-server-tls
{{- with .Values.controller.volumeMounts }}
{{- toYaml . | nindent 8 }}
{{- end }}
resources: resources:
{{- toYaml .Values.controller.resources | nindent 10 }} {{- toYaml .Values.controller.resources | nindent 10 }}
workingDir: /home/argocd
volumeMounts:
{{- with .Values.controller.volumeMounts }}
{{- toYaml . | nindent 8 }}
{{- end }}
- mountPath: /app/config/controller/tls
name: argocd-repo-server-tls
- mountPath: /home/argocd
name: argocd-home
{{- with .Values.controller.extraContainers }} {{- with .Values.controller.extraContainers }}
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
@ -273,10 +292,15 @@ spec:
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
volumes: volumes:
- emptyDir: {} {{- with .Values.controller.volumes }}
name: argocd-home {{- toYaml . | nindent 6 }}
{{- end }}
- name: argocd-home
emptyDir: {}
- name: argocd-repo-server-tls - name: argocd-repo-server-tls
secret: secret:
secretName: argocd-repo-server-tls
optional: true
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -284,11 +308,6 @@ spec:
path: tls.key path: tls.key
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt
optional: true
secretName: argocd-repo-server-tls
{{- with .Values.controller.volumes }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.controller.initContainers }} {{- with .Values.controller.initContainers }}
initContainers: initContainers:
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}

4
charts/argo-cd/templates/argocd-configs/argocd-styles-cm.yaml
View File

@ -2,10 +2,10 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: argocd-custom-styles name: argocd-styles-cm
labels: labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }} {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
data: data:
custom.styles.css: | custom.styles.css: |
{{- .Values.configs.styles | nindent 4 }} {{- .Values.configs.styles | nindent 4 }}
{{- end }} {{- end }}

92
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View File

@ -127,6 +127,12 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: redis.server key: redis.server
optional: true optional: true
- name: REDIS_COMPRESSION
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: redis.compression
optional: true
- name: REDISDB - name: REDISDB
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
@ -169,6 +175,30 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: reposerver.plugin.tar.exclusions key: reposerver.plugin.tar.exclusions
optional: true optional: true
- name: ARGOCD_REPO_SERVER_ALLOW_OUT_OF_BOUNDS_SYMLINKS
valueFrom:
configMapKeyRef:
key: reposerver.allow.oob.symlinks
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REPO_SERVER_STREAMED_MANIFEST_MAX_TAR_SIZE
valueFrom:
configMapKeyRef:
key: reposerver.streamed.manifest.max.tar.size
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REPO_SERVER_STREAMED_MANIFEST_MAX_EXTRACTED_SIZE
valueFrom:
configMapKeyRef:
key: reposerver.streamed.manifest.max.extracted.size
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_GIT_MODULES_ENABLED
valueFrom:
configMapKeyRef:
key: reposerver.enable.git.submodule
name: argocd-cmd-params-cm
optional: true
- name: HELM_CACHE_HOME - name: HELM_CACHE_HOME
value: /helm-working-dir value: /helm-working-dir
- name: HELM_CONFIG_HOME - name: HELM_CONFIG_HOME
@ -183,44 +213,42 @@ spec:
{{- if .Values.repoServer.volumeMounts }} {{- if .Values.repoServer.volumeMounts }}
{{- toYaml .Values.repoServer.volumeMounts | nindent 8 }} {{- toYaml .Values.repoServer.volumeMounts | nindent 8 }}
{{- end }} {{- end }}
- mountPath: /app/config/ssh
name: ssh-known-hosts
- mountPath: /app/config/tls
name: tls-certs
- mountPath: /app/config/gpg/source - mountPath: /app/config/gpg/source
name: gpg-keys name: gpg-keys
- mountPath: /app/config/gpg/keys - mountPath: /app/config/gpg/keys
name: gpg-keyring name: gpg-keyring
{{- if .Values.configs.knownHosts }}
- mountPath: /app/config/ssh
name: ssh-known-hosts
{{- end }}
- mountPath: /app/config/tls
name: tls-certs
- mountPath: /app/config/reposerver/tls - mountPath: /app/config/reposerver/tls
name: argocd-repo-server-tls name: argocd-repo-server-tls
- mountPath: /tmp
name: tmp-dir
- mountPath: /helm-working-dir - mountPath: /helm-working-dir
name: helm-working-dir name: helm-working-dir
- mountPath: /home/argocd/cmp-server/plugins - mountPath: /home/argocd/cmp-server/plugins
name: plugins name: plugins
- mountPath: /tmp
name: tmp
ports: ports:
- name: repo-server - name: repo-server
containerPort: {{ .Values.repoServer.containerPort }} containerPort: {{ .Values.repoServer.containerPort }}
protocol: TCP protocol: TCP
{{ if .Values.repoServer.metrics.enabled }}
- name: metrics - name: metrics
containerPort: 8084 containerPort: 8084
protocol: TCP protocol: TCP
{{- end }}
livenessProbe: livenessProbe:
tcpSocket: httpGet:
port: {{ .Values.repoServer.containerPort }} path: /healthz?full=true
port: metrics
initialDelaySeconds: {{ .Values.repoServer.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.repoServer.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.repoServer.livenessProbe.periodSeconds }} periodSeconds: {{ .Values.repoServer.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.repoServer.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.repoServer.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.repoServer.livenessProbe.successThreshold }} successThreshold: {{ .Values.repoServer.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.repoServer.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.repoServer.livenessProbe.failureThreshold }}
readinessProbe: readinessProbe:
tcpSocket: httpGet:
port: {{ .Values.repoServer.containerPort }} path: /healthz
port: metrics
initialDelaySeconds: {{ .Values.repoServer.readinessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.repoServer.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.repoServer.readinessProbe.periodSeconds }} periodSeconds: {{ .Values.repoServer.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.repoServer.readinessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.repoServer.readinessProbe.timeoutSeconds }}
@ -265,23 +293,29 @@ spec:
{{- with .Values.repoServer.volumes }} {{- with .Values.repoServer.volumes }}
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
- name: helm-working-dir
emptyDir: {}
- name: plugins
emptyDir: {}
- name: var-files
emptyDir: {}
- name: tmp
emptyDir: {}
- name: ssh-known-hosts
configMap:
name: argocd-ssh-known-hosts-cm
- name: tls-certs
configMap:
name: argocd-tls-certs-cm
- name: gpg-keys - name: gpg-keys
configMap: configMap:
name: argocd-gpg-keys-cm name: argocd-gpg-keys-cm
- emptyDir: {} - name: gpg-keyring
name: gpg-keyring
{{- if .Values.configs.knownHosts }}
- configMap:
name: argocd-ssh-known-hosts-cm
name: ssh-known-hosts
{{- end }}
- configMap:
name: argocd-tls-certs-cm
name: tls-certs
- name: helm-working-dir
emptyDir: {} emptyDir: {}
- name: argocd-repo-server-tls - name: argocd-repo-server-tls
secret: secret:
secretName: argocd-repo-server-tls
optional: true
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -289,14 +323,6 @@ spec:
path: tls.key path: tls.key
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt
optional: true
secretName: argocd-repo-server-tls
- emptyDir: {}
name: tmp-dir
- emptyDir: {}
name: var-files
- emptyDir: {}
name: plugins
initContainers: initContainers:
- command: - command:
- cp - cp

16
charts/argo-cd/templates/argocd-server/clusterrole.yaml
View File

@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: {{ template "argo-cd.server.fullname" . }} name: {{ include "argo-cd.server.fullname" . }}
labels: labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }} {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
rules: rules:
@ -29,10 +29,18 @@ rules:
- get - get
{{- if eq (index (coalesce .Values.server.config .Values.configs.cm) "exec.enabled") "true" }} {{- if eq (index (coalesce .Values.server.config .Values.configs.cm) "exec.enabled") "true" }}
- apiGroups: - apiGroups:
- "" - ""
resources: resources:
- pods/exec - pods/exec
verbs: verbs:
- create - create
{{- end }} {{- end }}
- apiGroups:
- argoproj.io
resources:
- applications
verbs:
- get
- list
- watch
{{- end }} {{- end }}

103
charts/argo-cd/templates/argocd-server/deployment.yaml
View File

@ -84,7 +84,7 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: server.log.format key: server.log.format
optional: true optional: true
- name: ARGOCD_REPO_SERVER_LOGLEVEL - name: ARGOCD_SERVER_LOG_LEVEL
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
@ -144,6 +144,18 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: server.repo.server.strict.tls key: server.repo.server.strict.tls
optional: true optional: true
- name: ARGOCD_SERVER_DEX_SERVER_PLAINTEXT
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: server.dex.server.plaintext
optional: true
- name: ARGOCD_SERVER_DEX_SERVER_STRICT_TLS
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: server.dex.server.strict.tls
optional: true
- name: ARGOCD_TLS_MIN_VERSION - name: ARGOCD_TLS_MIN_VERSION
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
@ -198,6 +210,12 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: redis.server key: redis.server
optional: true optional: true
- name: REDIS_COMPRESSION
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: redis.compression
optional: true
- name: REDISDB - name: REDISDB
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
@ -234,51 +252,50 @@ spec:
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
key: otlp.address key: otlp.address
optional: true optional: true
- name: ARGOCD_APPLICATION_NAMESPACES
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: application.namespaces
optional: true
{{- with .Values.server.envFrom }} {{- with .Values.server.envFrom }}
envFrom: envFrom:
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
{{- with .Values.server.volumeMounts }} {{- with .Values.server.volumeMounts }}
{{- toYaml . | nindent 8}} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.server.extensions.enabled }}
- name: extensions
mountPath: /tmp/extensions/
{{- end }}
{{- if .Values.configs.knownHosts }}
- mountPath: /app/config/ssh - mountPath: /app/config/ssh
name: ssh-known-hosts name: ssh-known-hosts
{{- end }}
- mountPath: /app/config/tls - mountPath: /app/config/tls
name: tls-certs name: tls-certs
- mountPath: /app/config/server/tls - mountPath: /app/config/server/tls
name: argocd-repo-server-tls name: argocd-repo-server-tls
{{- if .Values.configs.styles }} - mountPath: /app/config/dex/tls
- mountPath: "/shared/app/custom/custom.styles.css" name: argocd-dex-server-tls
subPath: "custom.styles.css"
name: custom-styles
{{- end }}
{{- if .Values.server.containerSecurityContext.readOnlyRootFilesystem }}
- mountPath: /home/argocd/.aws
name: aws-config
{{- end }}
- mountPath: /home/argocd - mountPath: /home/argocd
name: plugins-home name: plugins-home
- mountPath: /home/argocd/.aws
name: aws-config
- mountPath: /shared/app/custom
name: styles
- mountPath: /tmp - mountPath: /tmp
name: tmp-dir name: tmp
{{- if .Values.server.extensions.enabled }}
- mountPath: /tmp/extensions
name: extensions
{{- end }}
ports: ports:
- name: {{ .Values.server.name }} - name: {{ .Values.server.name }}
containerPort: {{ .Values.server.containerPort }} containerPort: {{ .Values.server.containerPort }}
protocol: TCP protocol: TCP
{{ if .Values.server.metrics.enabled }}
- name: metrics - name: metrics
containerPort: 8083 containerPort: 8083
protocol: TCP protocol: TCP
{{- end }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz?full=true
port: {{ .Values.server.containerPort }} port: {{ .Values.server.containerPort }}
initialDelaySeconds: {{ .Values.server.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.server.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.server.livenessProbe.periodSeconds }} periodSeconds: {{ .Values.server.livenessProbe.periodSeconds }}
@ -347,31 +364,30 @@ spec:
{{- with .Values.server.volumes }} {{- with .Values.server.volumes }}
{{- toYaml . | nindent 6}} {{- toYaml . | nindent 6}}
{{- end }} {{- end }}
- name: aws-config
emptyDir: {}
{{- if .Values.server.extensions.enabled }} {{- if .Values.server.extensions.enabled }}
- name: extensions - name: extensions
emptyDir: {} emptyDir: {}
{{- end }} {{- end }}
- emptyDir: {} - name: plugins-home
name: tmp-dir emptyDir: {}
{{- if .Values.server.containerSecurityContext.readOnlyRootFilesystem }} - name: tmp
- emptyDir: {} emptyDir: {}
name: aws-config - name: ssh-known-hosts
{{- end }} configMap:
{{- if .Values.configs.styles }}
- configMap:
name: argocd-custom-styles
name: custom-styles
{{- end }}
{{- if .Values.configs.knownHosts }}
- configMap:
name: argocd-ssh-known-hosts-cm name: argocd-ssh-known-hosts-cm
name: ssh-known-hosts - name: tls-certs
{{- end }} configMap:
- configMap:
name: argocd-tls-certs-cm name: argocd-tls-certs-cm
name: tls-certs - name: styles
configMap:
name: argocd-styles-cm
optional: true
- name: argocd-repo-server-tls - name: argocd-repo-server-tls
secret: secret:
secretName: argocd-repo-server-tls
optional: true
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -379,10 +395,15 @@ spec:
path: tls.key path: tls.key
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt
- name: argocd-dex-server-tls
secret:
secretName: argocd-dex-server-tls
optional: true optional: true
secretName: argocd-repo-server-tls items:
- emptyDir: {} - key: tls.crt
name: plugins-home path: tls.crt
- key: ca.crt
path: ca.crt
{{- with .Values.server.initContainers }} {{- with .Values.server.initContainers }}
initContainers: initContainers:
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}

3
charts/argo-cd/templates/argocd-server/role.yaml
View File

@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
name: {{ template "argo-cd.server.fullname" . }} name: {{ include "argo-cd.server.fullname" . }}
labels: labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }} {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
rules: rules:
@ -22,6 +22,7 @@ rules:
- argoproj.io - argoproj.io
resources: resources:
- applications - applications
- applicationsets
- appprojects - appprojects
{{- if .Values.server.extensions.enabled }} {{- if .Values.server.extensions.enabled }}
- argocdextensions - argocdextensions

30
charts/argo-cd/templates/crds/crd-application.yaml
View File

@ -343,8 +343,8 @@ spec:
and is only valid for applications sourced from Git. and is only valid for applications sourced from Git.
type: string type: string
plugin: plugin:
description: ConfigManagementPlugin holds config management description: Plugin holds config management plugin specific
plugin specific options options
properties: properties:
env: env:
description: Env is a list of environment variable entries description: Env is a list of environment variable entries
@ -689,8 +689,7 @@ spec:
and is only valid for applications sourced from Git. and is only valid for applications sourced from Git.
type: string type: string
plugin: plugin:
description: ConfigManagementPlugin holds config management plugin description: Plugin holds config management plugin specific options
specific options
properties: properties:
env: env:
description: Env is a list of environment variable entries description: Env is a list of environment variable entries
@ -1045,8 +1044,8 @@ spec:
and is only valid for applications sourced from Git. and is only valid for applications sourced from Git.
type: string type: string
plugin: plugin:
description: ConfigManagementPlugin holds config management description: Plugin holds config management plugin specific
plugin specific options options
properties: properties:
env: env:
description: Env is a list of environment variable entries description: Env is a list of environment variable entries
@ -1417,8 +1416,8 @@ spec:
from Git. from Git.
type: string type: string
plugin: plugin:
description: ConfigManagementPlugin holds config management description: Plugin holds config management plugin
plugin specific options specific options
properties: properties:
env: env:
description: Env is a list of environment variable description: Env is a list of environment variable
@ -1761,8 +1760,8 @@ spec:
and is only valid for applications sourced from Git. and is only valid for applications sourced from Git.
type: string type: string
plugin: plugin:
description: ConfigManagementPlugin holds config management description: Plugin holds config management plugin specific
plugin specific options options
properties: properties:
env: env:
description: Env is a list of environment variable description: Env is a list of environment variable
@ -1813,6 +1812,10 @@ spec:
reconciled using the latest git version reconciled using the latest git version
format: date-time format: date-time
type: string type: string
resourceHealthSource:
description: 'ResourceHealthSource indicates where the resource health
status is stored: inline if not set or appTree'
type: string
resources: resources:
description: Resources is a list of Kubernetes resources managed by description: Resources is a list of Kubernetes resources managed by
this application this application
@ -1849,6 +1852,9 @@ spec:
description: SyncStatusCode is a type which represents possible description: SyncStatusCode is a type which represents possible
comparison results comparison results
type: string type: string
syncWave:
format: int64
type: integer
version: version:
type: string type: string
type: object type: object
@ -2095,8 +2101,8 @@ spec:
and is only valid for applications sourced from Git. and is only valid for applications sourced from Git.
type: string type: string
plugin: plugin:
description: ConfigManagementPlugin holds config management description: Plugin holds config management plugin specific
plugin specific options options
properties: properties:
env: env:
description: Env is a list of environment variable description: Env is a list of environment variable

234
charts/argo-cd/templates/crds/crd-applicationset.yaml
View File

@ -9,7 +9,6 @@ metadata:
{{- with .Values.crds.annotations }} {{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
controller-gen.kubebuilder.io/version: v0.3.0
labels: labels:
app.kubernetes.io/name: applicationsets.argoproj.io app.kubernetes.io/name: applicationsets.argoproj.io
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
@ -2381,6 +2380,8 @@ spec:
properties: properties:
api: api:
type: string type: string
appSecretName:
type: string
labels: labels:
items: items:
type: string type: string
@ -2403,6 +2404,31 @@ spec:
- owner - owner
- repo - repo
type: object type: object
gitlab:
properties:
api:
type: string
labels:
items:
type: string
type: array
project:
type: string
pullRequestState:
type: string
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- project
type: object
requeueAfterSeconds: requeueAfterSeconds:
format: int64 format: int64
type: integer type: integer
@ -2664,6 +2690,31 @@ spec:
type: object type: object
scmProvider: scmProvider:
properties: properties:
azureDevOps:
properties:
accessTokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
allBranches:
type: boolean
api:
type: string
organization:
type: string
teamProject:
type: string
required:
- accessTokenRef
- organization
- teamProject
type: object
bitbucket: bitbucket:
properties: properties:
allBranches: allBranches:
@ -2768,6 +2819,8 @@ spec:
type: boolean type: boolean
api: api:
type: string type: string
appSecretName:
type: string
organization: organization:
type: string type: string
tokenRef: tokenRef:
@ -3065,6 +3118,29 @@ spec:
- spec - spec
type: object type: object
type: object type: object
selector:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
type: object
type: object type: object
type: array type: array
template: template:
@ -4534,6 +4610,8 @@ spec:
properties: properties:
api: api:
type: string type: string
appSecretName:
type: string
labels: labels:
items: items:
type: string type: string
@ -4556,6 +4634,31 @@ spec:
- owner - owner
- repo - repo
type: object type: object
gitlab:
properties:
api:
type: string
labels:
items:
type: string
type: array
project:
type: string
pullRequestState:
type: string
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- project
type: object
requeueAfterSeconds: requeueAfterSeconds:
format: int64 format: int64
type: integer type: integer
@ -4817,6 +4920,31 @@ spec:
type: object type: object
scmProvider: scmProvider:
properties: properties:
azureDevOps:
properties:
accessTokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
allBranches:
type: boolean
api:
type: string
organization:
type: string
teamProject:
type: string
required:
- accessTokenRef
- organization
- teamProject
type: object
bitbucket: bitbucket:
properties: properties:
allBranches: allBranches:
@ -4921,6 +5049,8 @@ spec:
type: boolean type: boolean
api: api:
type: string type: string
appSecretName:
type: string
organization: organization:
type: string type: string
tokenRef: tokenRef:
@ -5218,6 +5348,29 @@ spec:
- spec - spec
type: object type: object
type: object type: object
selector:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
type: object
type: object type: object
type: array type: array
mergeKeys: mergeKeys:
@ -5552,6 +5705,8 @@ spec:
properties: properties:
api: api:
type: string type: string
appSecretName:
type: string
labels: labels:
items: items:
type: string type: string
@ -5574,6 +5729,31 @@ spec:
- owner - owner
- repo - repo
type: object type: object
gitlab:
properties:
api:
type: string
labels:
items:
type: string
type: array
project:
type: string
pullRequestState:
type: string
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- project
type: object
requeueAfterSeconds: requeueAfterSeconds:
format: int64 format: int64
type: integer type: integer
@ -5835,6 +6015,31 @@ spec:
type: object type: object
scmProvider: scmProvider:
properties: properties:
azureDevOps:
properties:
accessTokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
allBranches:
type: boolean
api:
type: string
organization:
type: string
teamProject:
type: string
required:
- accessTokenRef
- organization
- teamProject
type: object
bitbucket: bitbucket:
properties: properties:
allBranches: allBranches:
@ -5939,6 +6144,8 @@ spec:
type: boolean type: boolean
api: api:
type: string type: string
appSecretName:
type: string
organization: organization:
type: string type: string
tokenRef: tokenRef:
@ -6236,8 +6443,33 @@ spec:
- spec - spec
type: object type: object
type: object type: object
selector:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
type: object
type: object type: object
type: array type: array
goTemplate:
type: boolean
syncPolicy: syncPolicy:
properties: properties:
preserveResourcesOnDeletion: preserveResourcesOnDeletion:

10
charts/argo-cd/templates/crds/crd-project.yaml
View File

@ -167,6 +167,10 @@ spec:
for apps which have orphaned resources for apps which have orphaned resources
type: boolean type: boolean
type: object type: object
permitOnlyProjectScopedClusters:
description: PermitOnlyProjectScopedClusters determines whether destinations
can only reference clusters which are project-scoped
type: boolean
roles: roles:
description: Roles are user defined RBAC roles associated with this description: Roles are user defined RBAC roles associated with this
project project
@ -229,6 +233,12 @@ spec:
- keyID - keyID
type: object type: object
type: array type: array
sourceNamespaces:
description: SourceNamespaces defines the namespaces application resources
are allowed to be created in
items:
type: string
type: array
sourceRepos: sourceRepos:
description: SourceRepos contains list of repository URLs which can description: SourceRepos contains list of repository URLs which can
be used for deployment be used for deployment