From 5d7d2bba01be30aee23bcb43b102aec6f909fde6 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Mon, 30 Oct 2023 01:31:55 +0100 Subject: [PATCH] Removed argocd config in template --- helm/template/Chart.yaml | 6 +++--- helm/template/_templates/application.yaml | 1 - helm/template/_values.yaml | 12 ----------- helm/template/templates/_application.yaml | 25 ----------------------- 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 helm/template/_templates/application.yaml delete mode 100644 helm/template/templates/_application.yaml diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml index c613ed5..42d9683 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.14 +version: 0.1.15 maintainers: - name: Jim Martens url: https://2martens.de @@ -10,8 +10,8 @@ sources: - https://git.2martens.de/2martens/cloud-configuration annotations: artifacthub.io/changes: | - - kind: added - description: Added more configuration options for applications + - kind: removed + description: Removed pointless argo config artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc diff --git a/helm/template/_templates/application.yaml b/helm/template/_templates/application.yaml deleted file mode 100644 index 9fdd191..0000000 --- a/helm/template/_templates/application.yaml +++ /dev/null @@ -1 +0,0 @@ -{{- include "template.application" . -}} diff --git a/helm/template/_values.yaml b/helm/template/_values.yaml index 4e36b04..08d2a1d 100644 --- a/helm/template/_values.yaml +++ b/helm/template/_values.yaml @@ -137,15 +137,3 @@ affinity: {} podSpec: {} # containerSpec: will be added at the bottom of the container specification in the pod template containerSpec: {} - -argocd: - enabled: false - 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 deleted file mode 100644 index 4d47ab3..0000000 --- a/helm/template/templates/_application.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- define "template.application" -}} -{{- if .Values.argocd.enabled }} -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: {{ include "template.fullname" . }} - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: {{ .Values.argocd.project }} - 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: {{ .Values.argocd.targetCluster }} - namespace: {{ .Values.application.namespace }} -{{- end }} -{{- end }}