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

chore(argo-cd): Convert manifests of 'kind: List' to dashes separated documents (#1120)

Browse source 
Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Kilchhofer 2022-02-03 10:36:26 +01:00 committed by GitHub
parent ba124f2587
commit a0a74fb43d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 99 additions and 107 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: v2.2.3 appVersion: v2.2.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.33.1 version: 3.33.2
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: |
- "[Fixed]: Consistent annotation quoting across all manifests" - "[Changed]: Convert manifests of 'kind: List' to dashes separated documents."

86
charts/argo-cd/templates/argocd-configs/applications.yaml
View file

@ -1,46 +1,42 @@
{{- if .Values.server.additionalApplications }} {{- range .Values.server.additionalApplications }}
apiVersion: v1 ---
kind: List apiVersion: argoproj.io/v1alpha1
items: kind: Application
{{- range .Values.server.additionalApplications }} metadata:
- apiVersion: argoproj.io/v1alpha1 {{- with .additionalAnnotations }}
kind: Application annotations:
metadata: {{- range $key, $value := . }}
{{- with .additionalAnnotations }} {{ $key }}: {{ $value | quote }}
annotations: {{- end }}
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
{{- with .additionalLabels }}
labels:
{{- toYaml . | nindent 8 }}
{{- end }}
name: {{ .name }}
{{- with .namespace }}
namespace: {{ . }}
{{- end }}
{{- with .finalizers }}
finalizers:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
project: {{ tpl .project $ }}
source:
{{- toYaml .source | nindent 8 }}
destination:
{{- toYaml .destination | nindent 8 }}
{{- with .syncPolicy }}
syncPolicy:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .ignoreDifferences }}
ignoreDifferences:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .info }}
info:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- with .additionalLabels }}
labels:
{{- toYaml . | nindent 8 }}
{{- end }}
name: {{ .name }}
{{- with .namespace }}
namespace: {{ . }}
{{- end }}
{{- with .finalizers }}
finalizers:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
project: {{ tpl .project $ }}
source:
{{- toYaml .source | nindent 8 }}
destination:
{{- toYaml .destination | nindent 8 }}
{{- with .syncPolicy }}
syncPolicy:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .ignoreDifferences }}
ignoreDifferences:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .info }}
info:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}

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

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