DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(argo-cd): Add ability to pass finalizers to AppProject (#982)

Browse source 
* feat(argo-cd): Add ability to pass finalizers to AppProject

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* chore: Use 'with' instead of 'if' and beautify indent style

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* docs: Add finalizers to example in values.yaml

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Kilchhofer 2021-10-19 18:59:08 +02:00 committed by GitHub
parent fbea5aa49b
commit 694f8b4fe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.1.3 appVersion: 2.1.3
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: 3.25.3 version: 3.26.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
keywords: keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Added]: Chart testing for HA setups" - "[Added]: Ability to add finalizers to AppProject"

50
charts/argo-cd/templates/argocd-configs/projects.yaml
View file

@ -2,53 +2,57 @@
apiVersion: v1 apiVersion: v1
kind: List kind: List
items: items:
{{- range .Values.server.additionalProjects }} {{- range .Values.server.additionalProjects }}
- apiVersion: argoproj.io/v1alpha1 - apiVersion: argoproj.io/v1alpha1
kind: AppProject kind: AppProject
metadata: metadata:
{{- if .additionalAnnotations }} {{- with .additionalAnnotations }}
annotations: annotations:
{{- range $key, $value := .additionalAnnotations }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- with .additionalLabels }}
{{- if .additionalLabels }}
labels: labels:
{{- toYaml .additionalLabels | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
name: {{ .name }} name: {{ .name }}
{{- if .namespace }} {{- with .namespace }}
namespace: {{ .namespace }} namespace: {{ . }}
{{- end }}
{{- with .finalizers }}
finalizers:
{{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
description: {{ .description }} description: {{ .description }}
sourceRepos: sourceRepos:
{{- toYaml .sourceRepos | nindent 8 }} {{- toYaml .sourceRepos | nindent 8 }}
destinations: destinations:
{{- toYaml .destinations | nindent 8 }} {{- toYaml .destinations | nindent 8 }}
{{- if .clusterResourceWhitelist }} {{- with .clusterResourceWhitelist }}
clusterResourceWhitelist: clusterResourceWhitelist:
{{- toYaml .clusterResourceWhitelist | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- if .namespaceResourceBlacklist }} {{- with .namespaceResourceBlacklist }}
namespaceResourceBlacklist: namespaceResourceBlacklist:
{{- toYaml .namespaceResourceBlacklist | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- if .namespaceResourceWhitelist }} {{- with .namespaceResourceWhitelist }}
namespaceResourceWhitelist: namespaceResourceWhitelist:
{{- toYaml .namespaceResourceWhitelist | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- if .orphanedResources }} {{- with .orphanedResources }}
orphanedResources: orphanedResources:
{{- toYaml .orphanedResources | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- if .roles }} {{- with .roles }}
roles: roles:
{{- toYaml .roles | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- if .syncWindows }} {{- with .syncWindows }}
syncWindows: syncWindows:
{{- toYaml .syncWindows | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

4
charts/argo-cd/values.yaml
View file

@ -850,6 +850,8 @@ server:
# namespace: argocd # namespace: argocd
# additionalLabels: {} # additionalLabels: {}
# additionalAnnotations: {} # additionalAnnotations: {}
# finalizers:
# - resources-finalizer.argocd.argoproj.io
# project: guestbook # project: guestbook
# source: # source:
# repoURL: https://github.com/argoproj/argocd-example-apps.git # repoURL: https://github.com/argoproj/argocd-example-apps.git
@ -880,6 +882,8 @@ server:
# namespace: argocd # namespace: argocd
# additionalLabels: {} # additionalLabels: {}
# additionalAnnotations: {} # additionalAnnotations: {}
# finalizers:
# - resources-finalizer.argocd.argoproj.io
# description: Example Project # description: Example Project
# sourceRepos: # sourceRepos:
# - '*' # - '*'