diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml index 7598b85..c613ed5 100644 --- a/helm/template/Chart.yaml +++ b/helm/template/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: template description: A Helm library chart containing common templates, keeping application templates short type: library -version: 0.1.13 +version: 0.1.14 maintainers: - name: Jim Martens url: https://2martens.de @@ -10,10 +10,8 @@ sources: - https://git.2martens.de/2martens/cloud-configuration annotations: artifacthub.io/changes: | - - kind: fixed - description: Fixed secret and ingress files - kind: added - description: Added support for ArgoCD application configuration + description: Added more configuration options for applications artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc diff --git a/helm/template/_values.yaml b/helm/template/_values.yaml index 6d55aab..4e36b04 100644 --- a/helm/template/_values.yaml +++ b/helm/template/_values.yaml @@ -143,4 +143,9 @@ argocd: project: default repoURL: https://github.com/exampleUser/exampleRepo targetRevision: HEAD + # pathInRepo: is required if it is a git repo pathInRepo: / + # chartName: required if repo is a Helm chart repo + chartName: "" + # targetCluster: specifies the cluster to deploy to + targetCluster: https://kubernetes.default.svc diff --git a/helm/template/templates/_application.yaml b/helm/template/templates/_application.yaml index f84306f..4d47ab3 100644 --- a/helm/template/templates/_application.yaml +++ b/helm/template/templates/_application.yaml @@ -12,9 +12,14 @@ spec: source: repoURL: {{ .Values.argocd.repoURL }} targetRevision: {{ .Values.argocd.targetRevision }} + {{- if .Values.argocd.pathInRepo }} path: {{ .Values.argocd.pathInRepo }} + {{- end }} + {{- if .Values.argocd.chartName }} + chart: {{ .Values.argocd.chartName }} + {{- end }} destination: - server: https://kubernetes.default.svc + server: {{ .Values.argocd.targetCluster }} namespace: {{ .Values.application.namespace }} {{- end }} {{- end }}