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

Merge branch 'main' into argo-rollouts-deployment-labels

Browse source 
Signed-off-by: Matthew Peterson <51802441+mpeters0n@users.noreply.github.com>
This commit is contained in:
Matthew Peterson 2024-03-23 09:49:07 -07:00 committed by GitHub
commit f794a12a39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 473 additions and 456 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-events/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v1.9.1 appVersion: v1.9.1
description: A Helm chart for Argo Events, the event-driven workflow automation framework description: A Helm chart for Argo Events, the event-driven workflow automation framework
name: argo-events name: argo-events
version: 2.4.3 version: 2.4.4
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4 icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4
keywords: keywords:
@ -18,5 +18,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: changed - kind: added
description: Bump argo-events to v1.9.1 description: Support ability to set .Values.namespaceOverride

1
charts/argo-events/README.md
View file

@ -87,6 +87,7 @@ done
| global.podLabels | object | `{}` | Labels for the all deployed pods | | global.podLabels | object | `{}` | Labels for the all deployed pods |
| global.securityContext | object | `{}` | Toggle and define securityContext. See [values.yaml] | | global.securityContext | object | `{}` | Toggle and define securityContext. See [values.yaml] |
| nameOverride | string | `"argo-events"` | Provide a name in place of `argo-events` | | nameOverride | string | `"argo-events"` | Provide a name in place of `argo-events` |
| namespaceOverride | string | `.Release.Namespace` | Override the namespace |
| openshift | bool | `false` | Deploy on OpenShift | | openshift | bool | `false` | Deploy on OpenShift |
### Controller ### Controller

8
charts/argo-events/templates/_helpers.tpl
View file

@ -136,3 +136,11 @@ Define Pdb apiVersion
{{- printf "policy/v1beta1" -}} {{- printf "policy/v1beta1" -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{/*
Expand the namespace of the release.
Allows overriding it for multi-namespace deployments in combined charts.
*/}}
{{- define "argo-events.namespace" -}}
{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
{{- end }}

2
charts/argo-events/templates/argo-events-controller/config.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ include "argo-events.controller.fullname" . }} name: {{ include "argo-events.controller.fullname" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "name" .Values.controller.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "name" .Values.controller.name) | nindent 4 }}
data: data:

2
charts/argo-events/templates/argo-events-controller/deployment.yaml
View file

@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ include "argo-events.controller.fullname" . }} name: {{ include "argo-events.controller.fullname" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
app.kubernetes.io/version: {{ include "argo-events.controller_chart_version_label" . }} app.kubernetes.io/version: {{ include "argo-events.controller_chart_version_label" . }}

2
charts/argo-events/templates/argo-events-controller/pdb.yaml
View file

@ -3,7 +3,7 @@ apiVersion: {{ template "argo-events.pdb.apiVersion" . }}
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:
name: {{ template "argo-events.controller.fullname" . }} name: {{ template "argo-events.controller.fullname" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
{{- with .Values.controller.pdb.labels }} {{- with .Values.controller.pdb.labels }}

4
charts/argo-events/templates/argo-events-controller/rbac.yaml
View file

@ -4,7 +4,7 @@ kind: {{ .Values.controller.rbac.namespaced | ternary "Role" "ClusterRole" }}
metadata: metadata:
name: {{ include "argo-events.controller.fullname" . }} name: {{ include "argo-events.controller.fullname" . }}
{{- if .Values.controller.rbac.namespaced }} {{- if .Values.controller.rbac.namespaced }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
{{- end }} {{- end }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
@ -122,5 +122,5 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ include "argo-events.controller.serviceAccountName" . }} name: {{ include "argo-events.controller.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
{{- end }} {{- end }}

2
charts/argo-events/templates/argo-events-controller/service.yaml
View file

@ -3,7 +3,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ template "argo-events.controller.fullname" . }}-metrics name: {{ template "argo-events.controller.fullname" . }}-metrics
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
{{- with .Values.controller.metrics.service.annotations }} {{- with .Values.controller.metrics.service.annotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}

2
charts/argo-events/templates/argo-events-controller/serviceaccount.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceAccount
automountServiceAccountToken: {{ .Values.controller.serviceAccount.automountServiceAccountToken }} automountServiceAccountToken: {{ .Values.controller.serviceAccount.automountServiceAccountToken }}
metadata: metadata:
name: {{ include "argo-events.controller.serviceAccountName" . }} name: {{ include "argo-events.controller.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
{{- with .Values.controller.serviceAccount.annotations }} {{- with .Values.controller.serviceAccount.annotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}

4
charts/argo-events/templates/argo-events-controller/servicemonitor.yaml
View file

@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ template "argo-events.controller.fullname" . }} name: {{ template "argo-events.controller.fullname" . }}
namespace: {{ default .Release.Namespace .Values.controller.metrics.serviceMonitor.namespace | quote }} namespace: {{ default (include "argo-events.namespace" .) .Values.controller.metrics.serviceMonitor.namespace | quote }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
{{- with .Values.controller.metrics.serviceMonitor.selector }} {{- with .Values.controller.metrics.serviceMonitor.selector }}
@ -29,7 +29,7 @@ spec:
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace | quote }} - {{ include "argo-events.namespace" . | quote }}
selector: selector:
matchLabels: matchLabels:
{{- include "argo-events.selectorLabels" (dict "context" . "component" .Values.controller.name "name" (printf "%s-metrics" .Values.controller.name)) | nindent 6 }} {{- include "argo-events.selectorLabels" (dict "context" . "component" .Values.controller.name "name" (printf "%s-metrics" .Values.controller.name)) | nindent 6 }}

2
charts/argo-events/templates/argo-events-webhook/clusterrolebinding.yaml
View file

@ -12,5 +12,5 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ include "argo-events.webhook.serviceAccountName" . }} name: {{ include "argo-events.webhook.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
{{- end }} {{- end }}

2
charts/argo-events/templates/argo-events-webhook/deployment.yaml
View file

@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: events-webhook name: events-webhook
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "component" .Values.webhook.name "name" .Values.webhook.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "component" .Values.webhook.name "name" .Values.webhook.name) | nindent 4 }}
app.kubernetes.io/version: {{ include "argo-events.webhook_chart_version_label" . }} app.kubernetes.io/version: {{ include "argo-events.webhook_chart_version_label" . }}

2
charts/argo-events/templates/argo-events-webhook/pdb.yaml
View file

@ -3,7 +3,7 @@ apiVersion: {{ template "argo-events.pdb.apiVersion" . }}
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:
name: {{ template "argo-events.webhook.fullname" . }} name: {{ template "argo-events.webhook.fullname" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "component" .Values.webhook.name "name" .Values.webhook.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "component" .Values.webhook.name "name" .Values.webhook.name) | nindent 4 }}
{{- with .Values.webhook.pdb.labels }} {{- with .Values.webhook.pdb.labels }}

2
charts/argo-events/templates/argo-events-webhook/service.yaml
View file

@ -3,7 +3,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: events-webhook name: events-webhook
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
labels: labels:
{{- include "argo-events.labels" (dict "context" . "name" .Values.webhook.name) | nindent 4 }} {{- include "argo-events.labels" (dict "context" . "name" .Values.webhook.name) | nindent 4 }}
spec: spec:

2
charts/argo-events/templates/argo-events-webhook/serviceaccount.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceAccount
automountServiceAccountToken: {{ .Values.webhook.serviceAccount.automountServiceAccountToken }} automountServiceAccountToken: {{ .Values.webhook.serviceAccount.automountServiceAccountToken }}
metadata: metadata:
name: {{ include "argo-events.webhook.serviceAccountName" . }} name: {{ include "argo-events.webhook.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ include "argo-events.namespace" . | quote }}
{{- with .Values.webhook.serviceAccount.annotations }} {{- with .Values.webhook.serviceAccount.annotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}

3
charts/argo-events/values.yaml
View file

@ -6,6 +6,9 @@
nameOverride: argo-events nameOverride: argo-events
# -- String to fully override "argo-events.fullname" template # -- String to fully override "argo-events.fullname" template
fullnameOverride: "" fullnameOverride: ""
# -- Override the namespace
# @default -- `.Release.Namespace`
namespaceOverride: ""
# -- Deploy on OpenShift # -- Deploy on OpenShift
openshift: false openshift: false

1
charts/argo-rollouts/README.md
View file

@ -61,6 +61,7 @@ For full list of changes please check ArtifactHub [changelog].
| notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the notifications secret | | notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the notifications secret |
| notifications.templates | object | `{}` | Notification templates | | notifications.templates | object | `{}` | Notification templates |
| notifications.triggers | object | `{}` | The trigger defines the condition when the notification should be sent | | notifications.triggers | object | `{}` | The trigger defines the condition when the notification should be sent |
| providerRBAC.additionalRules | list | `[]` | Additional RBAC rules for others providers |
| providerRBAC.enabled | bool | `true` | Toggles addition of provider-specific RBAC rules to the controller Role and ClusterRole | | providerRBAC.enabled | bool | `true` | Toggles addition of provider-specific RBAC rules to the controller Role and ClusterRole |
| providerRBAC.providers.ambassador | bool | `true` | Adds RBAC rules for the Ambassador provider | | providerRBAC.providers.ambassador | bool | `true` | Adds RBAC rules for the Ambassador provider |
| providerRBAC.providers.apisix | bool | `true` | Adds RBAC rules for the Apisix provider | | providerRBAC.providers.apisix | bool | `true` | Adds RBAC rules for the Apisix provider |

3
charts/argo-rollouts/templates/controller/clusterrole.yaml
View file

@ -276,5 +276,8 @@ rules:
verbs: verbs:
- '*' - '*'
{{- end }} {{- end }}
{{- with .Values.providerRBAC.additionalRules }}
{{ toYaml . }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
charts/argo-rollouts/values.yaml
View file

@ -277,6 +277,8 @@ providerRBAC:
contour: true contour: true
# -- Adds RBAC rules for the Gloo Platform provider, see `https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-glooplatform/blob/main/README.md` # -- Adds RBAC rules for the Gloo Platform provider, see `https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-glooplatform/blob/main/README.md`
glooPlatform: true glooPlatform: true
# -- Additional RBAC rules for others providers
additionalRules: []
dashboard: dashboard:
# -- Deploy dashboard server # -- Deploy dashboard server

4
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.2 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:
@ -18,4 +18,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: added - kind: added
description: Support Template Patch to ApplicationSet description: make the chart use maps instead of lists

8
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 | list | `[]` (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)
@ -59,7 +59,7 @@ applicationsets:
automated: automated:
prune: {{ .prune }} prune: {{ .prune }}
{{- end }} {{- end }}
- name: applicationset-list-generator applicationset-list-generator:
generators: generators:
- list: - list:
elements: elements:

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

@ -1,50 +1,50 @@
{{- range .Values.applications }} {{- range $appName, $appData:= .Values.applications }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: Application kind: Application
metadata: metadata:
{{- with .additionalAnnotations }} {{- with $appData.additionalAnnotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with .additionalLabels }} {{- with $appData.additionalLabels }}
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ .name }} name: {{ $appName }}
{{- with .namespace }} {{- with $appData.namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}
{{- with .finalizers }} {{- with $appData.finalizers }}
finalizers: finalizers:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
project: {{ tpl .project $ }} project: {{ tpl $appData.project $ }}
{{- with .source }} {{- with $appData.source }}
source: source:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .sources }} {{- with $appData.sources }}
sources: sources:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
destination: destination:
{{- toYaml .destination | nindent 4 }} {{- toYaml $appData.destination | nindent 4 }}
{{- with .syncPolicy }} {{- with $appData.syncPolicy }}
syncPolicy: syncPolicy:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .revisionHistoryLimit }} {{- with $appData.revisionHistoryLimit }}
revisionHistoryLimit: {{ . }} revisionHistoryLimit: {{ . }}
{{- end }} {{- end }}
{{- with .ignoreDifferences }} {{- with $appData.ignoreDifferences }}
ignoreDifferences: ignoreDifferences:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .info }} {{- with $appData.info }}
info: info:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}

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

@ -1,44 +1,43 @@
{{- range $appSetName, $appSetData:= .Values.applicationsets }}
{{- range .Values.applicationsets }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet kind: ApplicationSet
metadata: metadata:
{{- with .additionalAnnotations }} {{- with $appSetData.additionalAnnotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with .additionalLabels }} {{- with $appSetData.additionalLabels }}
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ .name }} name: {{ $appSetName }}
{{- with .namespace }} {{- with $appSetData.namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}
spec: spec:
{{- if hasKey . "goTemplate" }} {{- if hasKey $appSetData "goTemplate" }}
goTemplate: {{ .goTemplate }} goTemplate: {{ $appSetData.goTemplate }}
{{- end }} {{- end }}
{{- with .generators }} {{- with $appSetData.generators }}
generators: generators:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .ignoreApplicationDifferences }} {{- with $appSetData.ignoreApplicationDifferences }}
ignoreApplicationDifferences: ignoreApplicationDifferences:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .strategy }} {{- with $appSetData.strategy }}
strategy: strategy:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .syncPolicy }} {{- with $appSetData.syncPolicy }}
syncPolicy: syncPolicy:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .template }} {{- with $appSetData.template }}
template: template:
{{- with .metadata }} {{- with .metadata }}
metadata: metadata:
@ -84,7 +83,7 @@ spec:
{{- end }} {{- end }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- with .templatePatch }} {{- with $appSetData.templatePatch }}
templatePatch: | templatePatch: |
{{- . | nindent 4 }} {{- . | nindent 4 }}
{{- end }} {{- end }}

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

@ -1,25 +1,25 @@
{{- range .Values.extensions }} {{- range $extensionName, $extensionData:= .Values.extensions }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: ArgoCDExtension kind: ArgoCDExtension
metadata: metadata:
name: {{ .name }} name: {{ $extensionName }}
{{- with .namespace }} {{- with $extensionData.namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}
finalizers: finalizers:
- extensions-finalizer.argocd.argoproj.io - extensions-finalizer.argocd.argoproj.io
{{- with .additionalLabels }} {{- with $extensionData.additionalLabels }}
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .additionalAnnotations }} {{- with $extensionData.additionalAnnotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with .sources }} {{- with $extensionData.sources }}
spec: spec:
sources: sources:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}

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

@ -1,72 +1,72 @@
{{- range .Values.projects }} {{- range $projectName, $projectData := .Values.projects }}
--- ---
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: AppProject kind: AppProject
metadata: metadata:
{{- with .additionalAnnotations }} {{- with $projectData.additionalAnnotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with .additionalLabels }} {{- with $projectData.additionalLabels }}
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ .name }} name: {{ $projectName }}
{{- with .namespace }} {{- with $projectData.namespace }}
namespace: {{ . }} namespace: {{ . }}
{{- end }} {{- end }}
{{- with .finalizers }} {{- with $projectData.finalizers }}
finalizers: finalizers:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- with .permitOnlyProjectScopedClusters }} {{- with $projectData.permitOnlyProjectScopedClusters }}
permitOnlyProjectScopedClusters: {{ . }} permitOnlyProjectScopedClusters: {{ . }}
{{- end }} {{- end }}
description: {{ .description }} description: {{ $projectData.description }}
{{- with .sourceRepos }} {{- with $projectData.sourceRepos }}
sourceRepos: sourceRepos:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .destinations }} {{- with $projectData.destinations }}
destinations: destinations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .clusterResourceWhitelist }} {{- with $projectData.clusterResourceWhitelist }}
clusterResourceWhitelist: clusterResourceWhitelist:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .clusterResourceBlacklist }} {{- with $projectData.clusterResourceBlacklist }}
clusterResourceBlacklist: clusterResourceBlacklist:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .namespaceResourceBlacklist }} {{- with $projectData.namespaceResourceBlacklist }}
namespaceResourceBlacklist: namespaceResourceBlacklist:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .namespaceResourceWhitelist }} {{- with $projectData.namespaceResourceWhitelist }}
namespaceResourceWhitelist: namespaceResourceWhitelist:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .orphanedResources }} {{- with $projectData.orphanedResources }}
orphanedResources: orphanedResources:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .roles }} {{- with $projectData.roles }}
roles: roles:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .syncWindows }} {{- with $projectData.syncWindows }}
syncWindows: syncWindows:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .signatureKeys }} {{- with $projectData.signatureKeys }}
signatureKeys: signatureKeys:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .sourceNamespaces }} {{- with $projectData.sourceNamespaces }}
sourceNamespaces: sourceNamespaces:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}

24
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: {}
@ -43,10 +43,10 @@ applications: []
# value: https://argoproj.github.io/ # value: https://argoproj.github.io/
# -- 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: {}
@ -90,10 +90,10 @@ projects: []
# - argocd # - argocd
# -- 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: {}
@ -238,11 +238,11 @@ itemTemplates: []
# namespace: guestbook # namespace: guestbook
# -- DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info. # -- DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info.
# @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: {}