reimplement a bit and update chart version

Signed-off-by: Atze de Vries <devries@zorgdomein.nl>

charts/argo-cd/Chart.yaml

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

charts/argo-cd/templates/_helpers.tpl

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

charts/argo-cd/templates/argocd-server/certificate.yaml

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

charts/argo-cd/values.yaml

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