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

feat(argocd-apps)!: use maps instead of lists

Browse source 
Signed-off-by: irizzant <i.rizzante@gmail.com>
This commit is contained in:
irizzant 2024-02-21 21:31:43 +00:00
parent 43337b5e14
commit 402af475f4
14 changed files with 423 additions and 418 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argocd-apps/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
name: argocd-apps name: argocd-apps
description: A Helm chart for managing additional Argo CD Applications and Projects description: A Helm chart for managing additional Argo CD Applications and Projects
type: application type: application
version: 1.6.1 version: 2.0.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:

10
charts/argocd-apps/README.md
View file

@ -28,11 +28,11 @@ $ helm install my-release argo/argocd-apps
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| applications | list | `[]` (See [values.yaml]) | Deploy Argo CD Applications within this helm release | | applications | object | `{}` (See [values.yaml]) | Deploy Argo CD Applications within this helm release |
| applicationsets | list | `[]` (See [values.yaml]) | Deploy Argo CD ApplicationSets within this helm release | | applicationsets | object | `{}` (See [values.yaml]) | Deploy Argo CD ApplicationSets within this helm release |
| extensions | list | `[]` (See [values.yaml]) | DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info. | | extensions | object | `{}` (See [values.yaml]) | DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info. |
| itemTemplates | list | `[]` (See [values.yaml]) | Deploy Argo CD Applications/ApplicationSets/Projects within this helm release | | itemTemplates | object | `{}` (See [values.yaml]) | Deploy Argo CD Applications/ApplicationSets/Projects within this helm release |
| projects | list | `[]` (See [values.yaml]) | Deploy Argo CD Projects within this helm release | | projects | object | `{}` (See [values.yaml]) | Deploy Argo CD Projects within this helm release |
---------------------------------------------- ----------------------------------------------
Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs) Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)

2
charts/argocd-apps/ci/applications-multiple-sources-values.yaml
View file

@ -1,7 +1,7 @@
# Test with multi-source applications # Test with multi-source applications
applications: applications:
- name: argocd-application-multiple-sources argocd-application-multiple-sources:
additionalLabels: {} additionalLabels: {}
additionalAnnotations: {} additionalAnnotations: {}
finalizers: finalizers:

2
charts/argocd-apps/ci/applications-values.yaml
View file

@ -1,7 +1,7 @@
# Test with applications # Test with applications
applications: applications:
- name: argocd-application argocd-application:
additionalLabels: {} additionalLabels: {}
additionalAnnotations: {} additionalAnnotations: {}
finalizers: finalizers:

2
charts/argocd-apps/ci/applicationsets-multiple-sources-values.yaml
View file

@ -1,7 +1,7 @@
# Test with multi-source applicationsets # Test with multi-source applicationsets
applicationsets: applicationsets:
- name: applicationset-multiple-sources applicationset-multiple-sources:
generators: generators:
- list: - list:
elements: elements:

2
charts/argocd-apps/ci/applicationsets-progressive-syncs-values.yaml
View file

@ -1,7 +1,7 @@
# Test applicationsets with Progressive Syncs # Test applicationsets with Progressive Syncs
applicationsets: applicationsets:
- name: applicationset-progressive-syncs applicationset-progressive-syncs:
generators: generators:
- list: - list:
elements: elements:

4
charts/argocd-apps/ci/applicationsets-values.yaml
View file

@ -1,7 +1,7 @@
# Test with applicationsets # Test with applicationsets
applicationsets: applicationsets:
- name: applicationset applicationset:
additionalLabels: {} additionalLabels: {}
additionalAnnotations: {} additionalAnnotations: {}
# See PR #10026 (ArgoCD v2.5 or later) # See PR #10026 (ArgoCD v2.5 or later)
@ -46,7 +46,7 @@ applicationsets:
syncPolicy: syncPolicy:
# Set Application finalizer # Set Application finalizer
preserveResourcesOnDeletion: false preserveResourcesOnDeletion: false
- name: applicationset-list-generator applicationset-list-generator:
generators: generators:
- list: - list:
elements: elements:

6
charts/argocd-apps/ci/item-templates.yaml
View file

@ -1,5 +1,6 @@
itemTemplates: itemTemplates:
- items: first:
items:
- name: my-appset - name: my-appset
generators: &generators generators: &generators
- list: - list:
@ -29,7 +30,8 @@ itemTemplates:
destination: destination:
server: "{{`{{cluster}}`}}" server: "{{`{{cluster}}`}}"
namespace: guestbook namespace: guestbook
- items: second:
items:
- name: my-appset - name: my-appset
generators: generators:
- list: - list:

6
charts/argocd-apps/templates/applications.yaml
View file

@ -1,9 +1,9 @@
{{- range .Values.applications }} {{- range $k, $v := .Values.applications }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: Application kind: Application
metadata: metadata:
{{- with .additionalAnnotations }} {{- with $v.additionalAnnotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
@ -13,7 +13,7 @@ metadata:
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ .name }} name: {{ $k }}
{{- with .namespace }} {{- with .namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}

4
charts/argocd-apps/templates/applicationsets.yaml
View file

@ -1,5 +1,5 @@
{{- range .Values.applicationsets }} {{- range $k, $v := .Values.applicationsets }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet kind: ApplicationSet
@ -14,7 +14,7 @@ metadata:
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ .name }} name: {{ $k }}
{{- with .namespace }} {{- with .namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}

4
charts/argocd-apps/templates/extensions.yaml
View file

@ -1,9 +1,9 @@
{{- range .Values.extensions }} {{- range $k, $v := .Values.extensions }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: ArgoCDExtension kind: ArgoCDExtension
metadata: metadata:
name: {{ .name }} name: {{ $k }}
{{- with .namespace }} {{- with .namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}

2
charts/argocd-apps/templates/item-templates.yaml
View file

@ -1,4 +1,4 @@
{{- range .Values.itemTemplates }} {{- range $k, $v := .Values.itemTemplates }}
{{- if kindIs "string" .template }} {{- if kindIs "string" .template }}
{{- $template := .template -}} {{- $template := .template -}}
{{- range .items }} {{- range .items }}

4
charts/argocd-apps/templates/projects.yaml
View file

@ -1,4 +1,4 @@
{{- range .Values.projects }} {{- range $k, $v := .Values.projects }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: AppProject kind: AppProject
@ -13,7 +13,7 @@ metadata:
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ .name }} name: {{ $k }}
{{- with .namespace }} {{- with .namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}

25
charts/argocd-apps/values.yaml
View file

@ -1,8 +1,8 @@
# -- Deploy Argo CD Applications within this helm release # -- Deploy Argo CD Applications within this helm release
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/
applications: [] applications: {}
# - name: guestbook # guestbook:
# namespace: argocd # namespace: argocd
# additionalLabels: {} # additionalLabels: {}
# additionalAnnotations: {} # additionalAnnotations: {}
@ -45,8 +45,8 @@ applications: []
# -- Deploy Argo CD Projects within this helm release # -- Deploy Argo CD Projects within this helm release
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/
projects: [] projects: {}
# - name: guestbook # guestbook:
# namespace: argocd # namespace: argocd
# additionalLabels: {} # additionalLabels: {}
# additionalAnnotations: {} # additionalAnnotations: {}
@ -92,8 +92,8 @@ projects: []
# -- Deploy Argo CD ApplicationSets within this helm release # -- Deploy Argo CD ApplicationSets within this helm release
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/ ## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/
applicationsets: [] applicationsets: {}
# - name: guestbook # guestbook:
# namespace: argocd # namespace: argocd
# additionalLabels: {} # additionalLabels: {}
# additionalAnnotations: {} # additionalAnnotations: {}
@ -161,8 +161,9 @@ applicationsets: []
# -- Deploy Argo CD Applications/ApplicationSets/Projects within this helm release # -- Deploy Argo CD Applications/ApplicationSets/Projects within this helm release
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/ ## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/
itemTemplates: [] itemTemplates: {}
# - items: # first:
# items:
# - name: my-appset # - name: my-appset
# generators: &generators # generators: &generators
# - list: # - list:
@ -192,7 +193,8 @@ itemTemplates: []
# destination: # destination:
# server: "{{`{{cluster}}`}}" # server: "{{`{{cluster}}`}}"
# namespace: guestbook # namespace: guestbook
# - items: # second:
# items:
# - name: my-appset # - name: my-appset
# generators: # generators:
# - list: # - list:
@ -227,8 +229,8 @@ itemTemplates: []
# @default -- `[]` (See [values.yaml]) # @default -- `[]` (See [values.yaml])
## This function in tech preview stage, do expect unstability or breaking changes in newer versions. Bump image.tag if necessary. ## This function in tech preview stage, do expect unstability or breaking changes in newer versions. Bump image.tag if necessary.
## Ref: https://github.com/argoproj-labs/argocd-extensions ## Ref: https://github.com/argoproj-labs/argocd-extensions
extensions: [] extensions: {}
# - name: example # example:
# namespace: argocd # namespace: argocd
# additionalLabels: {} # additionalLabels: {}
# additionalAnnotations: {} # additionalAnnotations: {}
@ -237,3 +239,4 @@ extensions: []
# url: https://github.com/argoproj-labs/argocd-example-extension.git # url: https://github.com/argoproj-labs/argocd-example-extension.git
# - web: # - web:
# url: https://github.com/argoproj-labs/argocd-example-extension/releases/download/v0.1.0/extension.tar # url: https://github.com/argoproj-labs/argocd-example-extension/releases/download/v0.1.0/extension.tar
#