Skip to content

Commit 67f44f9

Browse files
tgiglimkilchhofer
andauthored
fix(argo-cd): Update ingress class annotation for GKE compatibility (#3493)
* fix(ingress): update ingress class annotation for GKE compatibility Signed-off-by: Tiago Gigli <tiago@privateid.com> * chore(chart): bump version to 8.3.8 and update changelog annotations Signed-off-by: Tiago Gigli <tiago@privateid.com> * chore: Drop changelog entry from previous PR Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com> * chore: Add newline Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com> * chore: Bump chart version again after resolving merge conflicts Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com> --------- Signed-off-by: Tiago Gigli <tiago@privateid.com> Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com> Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
1 parent 4ba594e commit 67f44f9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v3.1.5
33
kubeVersion: ">=1.25.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 8.3.8
6+
version: 8.3.9
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -27,4 +27,4 @@ annotations:
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
2929
- kind: fixed
30-
description: Correct instruction how to override argocd-params-cm.
30+
description: Update ingress class annotation for GKE compatibility

charts/argo-cd/templates/argocd-server/gke/ingress.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ metadata:
1212
{{- toYaml . | nindent 4 }}
1313
{{- end }}
1414
annotations:
15-
ingressClassName: "gce"
15+
{{- with .Values.server.ingress.ingressClassName }}
16+
kubernetes.io/ingress.class: {{ . }}
17+
{{- end }}
1618
{{- if .Values.server.ingress.gke.managedCertificate.create }}
1719
networking.gke.io/managed-certificates: {{ include "argo-cd.server.fullname" . }}
1820
{{- end }}
@@ -23,9 +25,6 @@ metadata:
2325
{{ $key }}: {{ $value | quote }}
2426
{{- end }}
2527
spec:
26-
{{- with .Values.server.ingress.ingressClassName }}
27-
ingressClassName: {{ . }}
28-
{{- end }}
2928
rules:
3029
- host: {{ .Values.server.ingress.hostname | default .Values.global.domain }}
3130
http:

0 commit comments

Comments
 (0)