controller-service.yaml - option for uppercase/lowercase appProtocol

values.yaml - adding default as lowercase value for appProtocol http/https

Author: hau21um

charts/ingress-nginx/Chart.yaml

@@ -1,9 +1,7 @@
 annotations:
   artifacthub.io/changes: |
-     - "Added a doc line to the missing helm value service.internal.loadBalancerIP (#9406)"
-     - "feat(helm): Add loadBalancerClass (#9562)"
-     - "added helmshowvalues example (#10019)"
-     - "Update Ingress-Nginx version controller-v1.8.1"
+     - "Optional uppercase falue of appProtocol for controller service"
+     - "Making appProtocol available also on GKE k8s"
   artifacthub.io/prerelease: "false"
 apiVersion: v2
 appVersion: 1.8.1
@@ -23,4 +21,4 @@ maintainers:
 name: ingress-nginx
 sources:
 - https://github.com/kubernetes/ingress-nginx
-version: 4.7.1
+version: 4.7.2

charts/ingress-nginx/templates/controller-service.yaml

@@ -57,8 +57,8 @@ spec:
       port: {{ .Values.controller.service.ports.http }}
       protocol: TCP
       targetPort: {{ .Values.controller.service.targetPorts.http }}
-    {{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
-      appProtocol: http
+    {{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
+      appProtocol: {{- if .Values.controller.service.appProtocolInUpperCase }} HTTP {{- else }} http {{ end }}
     {{- end }}
     {{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.http))) }}
       nodePort: {{ .Values.controller.service.nodePorts.http }}
@@ -69,8 +69,8 @@ spec:
       port: {{ .Values.controller.service.ports.https }}
       protocol: TCP
       targetPort: {{ .Values.controller.service.targetPorts.https }}
-    {{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
-      appProtocol: https
+    {{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
+      appProtocol: {{- if .Values.controller.service.appProtocolInUpperCase }} HTTPS {{- else }} https {{ end }}
     {{- end }}
     {{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.https))) }}
       nodePort: {{ .Values.controller.service.nodePorts.https }}

charts/ingress-nginx/values.yaml

@@ -413,8 +413,10 @@ controller:
     # It allows choosing the protocol for each backend specified in the Kubernetes service.
     # See the following GitHub issue for more details about the purpose: https://github.com/kubernetes/kubernetes/issues/40244
     # Will be ignored for Kubernetes versions older than 1.20
+    # For GatewayAPI in GKE uppercase values are expected, otherwise LB healthchecks will be allways http.
     ##
     appProtocol: true
+    appProtocolInUpperCase: false
     annotations: {}
     labels: {}
     # clusterIP: ""