diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index bc547f09..4e7c318f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.1.2 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.21.1 +version: 3.22.0 home: https://github.com/argoproj/argo-helm icon: https://argoproj.github.io/argo-cd/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Fixed]: Dex deployment now also supports hostAliases" + - "[Added]: Support for server.additionalApplications[].info" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index bb3e724d..95a938dc 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -175,6 +175,8 @@ NAME: my-release | configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` | | configs.styles | Define custom CSS styles for your argo instance ([Read More](https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/)). This Settings will automatically mount the provided css and reference it in the argo configuration. | `""` (See [values.yaml](values.yaml)) | | openshift.enabled | enables using arbitrary uid for argo repo server | `false` | +| server.additionalApplications | Deploy ArgoCD Applications within this helm release | `[]` (See [values.yaml](values.yaml)) | +| server.additionalProjects | Deploy ArgoCD Projects within this helm release | `[]` (See [values.yaml](values.yaml)) | ## ArgoCD Controller diff --git a/charts/argo-cd/templates/argocd-server/applications.yaml b/charts/argo-cd/templates/argocd-server/applications.yaml index 1b9d424a..d4d6171b 100644 --- a/charts/argo-cd/templates/argocd-server/applications.yaml +++ b/charts/argo-cd/templates/argocd-server/applications.yaml @@ -2,41 +2,45 @@ apiVersion: v1 kind: List items: -{{- range .Values.server.additionalApplications }} + {{- range .Values.server.additionalApplications }} - apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - {{- if .additionalAnnotations }} + {{- with .additionalAnnotations }} annotations: - {{- range $key, $value := .additionalAnnotations }} + {{- range $key, $value := . }} {{ $key }}: {{ $value | quote }} + {{- end }} {{- end }} - {{- end }} - {{- if .additionalLabels }} + {{- with .additionalLabels }} labels: -{{- toYaml .additionalLabels | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} name: {{ .name }} - {{- if .namespace }} - namespace: {{ .namespace }} + {{- with .namespace }} + namespace: {{ . }} {{- end }} - {{- if .finalizers }} + {{- with .finalizers }} finalizers: -{{- toYaml .finalizers | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} spec: project: {{ tpl .project $ }} source: -{{- toYaml .source | nindent 8 }} + {{- toYaml .source | nindent 8 }} destination: -{{- toYaml .destination | nindent 8 }} - {{- if .syncPolicy }} + {{- toYaml .destination | nindent 8 }} + {{- with .syncPolicy }} syncPolicy: -{{- toYaml .syncPolicy | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} - {{- if .ignoreDifferences }} + {{- with .ignoreDifferences }} ignoreDifferences: -{{- toYaml .ignoreDifferences | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} -{{- end }} + {{- with .info }} + info: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 17d95a80..d914eacf 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -847,13 +847,21 @@ server: # path: guestbook # directory: # recurse: true - # destination: + # destination: # server: https://kubernetes.default.svc # namespace: guestbook - # syncPolicy: - # automated: - # prune: false - # selfHeal: false + # syncPolicy: + # automated: + # prune: false + # selfHeal: false + # ignoreDifferences: + # - group: apps + # kind: Deployment + # jsonPointers: + # - /spec/replicas + # info: + # - name: url + # value: https://argoproj.github.io/ ## Projects ## reference: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/