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

reimplement a bit and update chart version

Browse source 
Signed-off-by: Atze de Vries <devries@zorgdomein.nl>
This commit is contained in:
Atze de Vries 2021-06-21 14:07:05 +02:00
parent b5d4168634
commit 7431283e36
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.0.1 appVersion: 2.0.1
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.6.3 version: 3.6.9
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

4
charts/argo-cd/templates/_helpers.tpl
View file

@ -144,8 +144,8 @@ app.kubernetes.io/component: {{ .component }}
Return the appropriate apiVersion for ingress Return the appropriate apiVersion for ingress
*/}} */}}
{{- define "argo-cd.ingress.apiVersion" -}} {{- define "argo-cd.ingress.apiVersion" -}}
{{- if .Values.APIOverrides -}} {{- if ne .Values.apiVersionOverrides.ingress "" -}}
{{- print .Values.APIOverrides.ingress -}} {{- print .Values.apiVersionOverrides.ingress -}}
{{- else if semverCompare "<1.14-0" (include "argo-cd.kubeVersion" $) -}} {{- else if semverCompare "<1.14-0" (include "argo-cd.kubeVersion" $) -}}
{{- print "extensions/v1beta1" -}} {{- print "extensions/v1beta1" -}}
{{- else if semverCompare "<1.19-0" (include "argo-cd.kubeVersion" $) -}} {{- else if semverCompare "<1.19-0" (include "argo-cd.kubeVersion" $) -}}

4
charts/argo-cd/templates/argocd-server/certificate.yaml
View file

@ -1,6 +1,6 @@
{{- if .Values.server.certificate.enabled -}} {{- if .Values.server.certificate.enabled -}}
{{- if .Values.APIOverrides -}} {{- if ne .Values.apiVersionOverrides.certmanager "" -}}
apiVersion: {{ .Values.APIOverrides.certmanager }} apiVersion: {{ .Values.apiVersionOverrides.certmanager }}
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1" }} {{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1" }}
apiVersion: cert-manager.io/v1 apiVersion: cert-manager.io/v1
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }} {{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }}

7
charts/argo-cd/values.yaml
View file

@ -26,10 +26,9 @@ global:
# Override APIVersions # Override APIVersions
# If you want to template helm charts but cannot access k8s API server # If you want to template helm charts but cannot access k8s API server
# you can set api versions here # you can set api versions here
APIOverrides: apiVersionOverrides:
enabled: false certmanager: "" #cert-manager.io/v1
certmanager: cert-manager.io/v1 ingress: "" #networking.k8s.io/v1beta1
ingress: networking.k8s.io/v1beta1
## Controller ## Controller
controller: controller: