fix(argo-cd): make gateway API backend protocol selection work for server

When using gateway API (https://gateway-api.sigs.k8s.io/) to configure a
Gateway and an HTTPRoute to access Argo CD server, backend protocol
selection (https://gateway-api.sigs.k8s.io/guides/backend-protocol/)
relies on the appProtocol field of the backend service port
(https://gateway-api.sigs.k8s.io/reference/spec/#backendref). Valid
values for this field are described in KEP-3726
(https://github.com/kubernetes/enhancements/tree/master/keps/sig-network/3726-standard-application-protocols).

Signed-off-by: Yann Soubeyrand <8511577+yann-soubeyrand@users.noreply.github.com>

Author: yann-soubeyrand

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v3.2.0
 kubeVersion: ">=1.25.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 9.1.1
+version: 9.1.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -26,5 +26,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: removed
-      description: Remove `server.rbac.log.enforce.enable` flag in `configs.cm`
+    - kind: fixed
+      description: Make gateway API backend protocol selection work for server.

charts/argo-cd/README.md

@@ -1322,6 +1322,7 @@ NAME: my-release
 | server.service.nodePortHttp | int | `30080` | Server service http port for NodePort service type (only if `server.service.type` is set to "NodePort") |
 | server.service.nodePortHttps | int | `30443` | Server service https port for NodePort service type (only if `server.service.type` is set to "NodePort") |
 | server.service.servicePortHttp | int | `80` | Server service http port |
+| server.service.servicePortHttpAppProtocol | string | `"kubernetes.io/h2c"` | Server service http port appProtocol |
 | server.service.servicePortHttpName | string | `"http"` | Server service http port name, can be used to route traffic via istio |
 | server.service.servicePortHttps | int | `443` | Server service https port |
 | server.service.servicePortHttpsAppProtocol | string | `""` | Server service https port appProtocol |

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

@@ -44,6 +44,9 @@ spec:
     {{- if eq .Values.server.service.type "NodePort" }}
     nodePort: {{ .Values.server.service.nodePortHttp }}
     {{- end }}
+    {{- with .Values.server.service.servicePortHttpAppProtocol }}
+    appProtocol: {{ . }}
+    {{- end }}
   - name: {{ .Values.server.service.servicePortHttpsName }}
     protocol: TCP
     port: {{ .Values.server.service.servicePortHttps }}
@@ -56,4 +59,3 @@ spec:
     {{- end }}
   selector:
     {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
-

charts/argo-cd/values.yaml

@@ -2307,6 +2307,9 @@ server:
     servicePortHttpName: http
     # -- Server service https port name, can be used to route traffic via istio
     servicePortHttpsName: https
+    # -- Server service http port appProtocol
+    ## Ref: https://kubernetes.io/docs/concepts/services-networking/service/#application-protocol
+    servicePortHttpAppProtocol: "kubernetes.io/h2c"
     # -- Server service https port appProtocol
     ## Ref: https://kubernetes.io/docs/concepts/services-networking/service/#application-protocol
     servicePortHttpsAppProtocol: ""