Making Kube service appProtocol field optional (#7873)

This commit is contained in:
Anton Holovin 2021-11-26 12:36:52 +02:00 committed by GitHub
parent cabc6ec144
commit 5a5bff1fb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions

View file

@ -2,6 +2,10 @@
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org). This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
### 4.0.11
- [7873] https://github.com/kubernetes/ingress-nginx/pull/7873 Makes the [appProtocol](https://kubernetes.io/docs/concepts/services-networking/_print/#application-protocol) field optional.
### 4.0.10 ### 4.0.10
- [7964] https://github.com/kubernetes/ingress-nginx/pull/7964 Update controller version to v1.1.0 - [7964] https://github.com/kubernetes/ingress-nginx/pull/7964 Update controller version to v1.1.0

View file

@ -2,7 +2,7 @@ apiVersion: v2
name: ingress-nginx name: ingress-nginx
# When the version is modified, make sure the artifacthub.io/changes list is updated # When the version is modified, make sure the artifacthub.io/changes list is updated
# Also update CHANGELOG.md # Also update CHANGELOG.md
version: 4.0.10 version: 4.0.11
appVersion: 1.1.0 appVersion: 1.1.0
home: https://github.com/kubernetes/ingress-nginx home: https://github.com/kubernetes/ingress-nginx
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer

View file

@ -54,7 +54,7 @@ spec:
port: {{ .Values.controller.service.ports.http }} port: {{ .Values.controller.service.ports.http }}
protocol: TCP protocol: TCP
targetPort: {{ .Values.controller.service.targetPorts.http }} targetPort: {{ .Values.controller.service.targetPorts.http }}
{{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }} {{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
appProtocol: http appProtocol: http
{{- end }} {{- end }}
{{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.http))) }} {{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.http))) }}
@ -66,7 +66,7 @@ spec:
port: {{ .Values.controller.service.ports.https }} port: {{ .Values.controller.service.ports.https }}
protocol: TCP protocol: TCP
targetPort: {{ .Values.controller.service.targetPorts.https }} targetPort: {{ .Values.controller.service.targetPorts.https }}
{{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }} {{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
appProtocol: https appProtocol: https
{{- end }} {{- end }}
{{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.https))) }} {{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.https))) }}

View file

@ -432,6 +432,14 @@ controller:
service: service:
enabled: true enabled: true
## If enabled is adding an appProtocol option for Kubernetes service. An appProtocol field replacing annotations that were
## using for setting a backend protocol. Here is an example for AWS: service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
## 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
##
appProtocol: true
annotations: {} annotations: {}
labels: {} labels: {}
# clusterIP: "" # clusterIP: ""