From ec31320b2e391321ead44d01f216186644992de1 Mon Sep 17 00:00:00 2001 From: Alex <3712883+w3irdrobot@users.noreply.github.com> Date: Thu, 19 May 2022 07:51:00 -0400 Subject: [PATCH] fix(argo-cd): Fix indent on Argo CD applications and projects (#1283) * fix(argo-cd): Fix indent on Argo CD application creation Signed-off-by: Alex Sears * Version bump Signed-off-by: Alex Sears * Add ArtifactHub change annotation Signed-off-by: Alex Sears * Helm docs run Signed-off-by: Alex Sears * Fix indent also on 'server.additionalProjects' Signed-off-by: Marco Kilchhofer * Reword changelog Signed-off-by: Marco Kilchhofer * Restore README (use helm-docs v1.9.1 Signed-off-by: Marco Kilchhofer Co-authored-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 7 +++--- .../argocd-configs/applications.yaml | 14 ++++++------ .../templates/argocd-configs/projects.yaml | 22 +++++++++---------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 2f357f8d..589f0792 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.3.3 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 4.6.0 +version: 4.6.1 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,6 +21,5 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Added]: Metrics service name can now be changed" - - "[Added]: ServiceMonitor now support tlsConfig" - - "[Changed]: All metrics Service ports were renamed from 'metrics' to 'http-metrics' (istio compatibility)" + - "[Fixed]: Fix indent on 'additionalApplications'" + - "[Fixed]: Fix indent on 'additionalProjects'" diff --git a/charts/argo-cd/templates/argocd-configs/applications.yaml b/charts/argo-cd/templates/argocd-configs/applications.yaml index f40a259e..cdde790d 100644 --- a/charts/argo-cd/templates/argocd-configs/applications.yaml +++ b/charts/argo-cd/templates/argocd-configs/applications.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .additionalLabels }} labels: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} name: {{ .name }} {{- with .namespace }} @@ -19,24 +19,24 @@ metadata: {{- end }} {{- with .finalizers }} finalizers: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} spec: project: {{ tpl .project $ }} source: - {{- toYaml .source | nindent 8 }} + {{- toYaml .source | nindent 4 }} destination: - {{- toYaml .destination | nindent 8 }} + {{- toYaml .destination | nindent 4 }} {{- with .syncPolicy }} syncPolicy: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .ignoreDifferences }} ignoreDifferences: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .info }} info: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- end }} diff --git a/charts/argo-cd/templates/argocd-configs/projects.yaml b/charts/argo-cd/templates/argocd-configs/projects.yaml index 74b674cd..54a232c1 100644 --- a/charts/argo-cd/templates/argocd-configs/projects.yaml +++ b/charts/argo-cd/templates/argocd-configs/projects.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .additionalLabels }} labels: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} name: {{ .name }} {{- with .namespace }} @@ -19,40 +19,40 @@ metadata: {{- end }} {{- with .finalizers }} finalizers: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} spec: description: {{ .description }} sourceRepos: - {{- toYaml .sourceRepos | nindent 8 }} + {{- toYaml .sourceRepos | nindent 4 }} destinations: - {{- toYaml .destinations | nindent 8 }} + {{- toYaml .destinations | nindent 4 }} {{- with .clusterResourceWhitelist }} clusterResourceWhitelist: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .namespaceResourceBlacklist }} namespaceResourceBlacklist: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .namespaceResourceWhitelist }} namespaceResourceWhitelist: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .orphanedResources }} orphanedResources: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .roles }} roles: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .syncWindows }} syncWindows: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .signatureKeys }} signatureKeys: - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- end }}