Skip to content

Commit 4361393

Browse files
karolkieglerskikarolkieglerski
committed
Fix-semver-and-gcp-appProtocol
1 parent df9d0e1 commit 4361393

File tree

6 files changed

+37
-6
lines changed

6 files changed

+37
-6
lines changed

‎charts/ingress-nginx/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
536536
| defaultBackend.tolerations | list | `[]` | Node tolerations for server scheduling to nodes with taints # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ # |
537537
| defaultBackend.updateStrategy | object | `{}` | The update strategy to apply to the Deployment or DaemonSet # |
538538
| dhParam | string | `""` | A base64-encoded Diffie-Hellman parameter. This can be generated with: `openssl dhparam 4096 2> /dev/null | base64` # Ref: https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/ssl-dh-param |
539+
| cloudProvider | string | `""` | Specify cloud provider which will be used to install chart, eg GCP, AWS, Azure ... # Ref: https://cloud.google.com/kubernetes-engine/docs/how-to/secure-gateway |
539540
| imagePullSecrets | list | `[]` | Optional array of imagePullSecrets containing private registry credentials # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ |
540541
| namespaceOverride | string | `""` | Override the deployment namespace; defaults to .Release.Namespace |
541542
| podSecurityPolicy.enabled | bool | `false` | |

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ spec:
5858
port: {{ .Values.controller.service.internal.ports.http | default .Values.controller.service.ports.http }}
5959
protocol: TCP
6060
targetPort: {{ .Values.controller.service.internal.targetPorts.http | default .Values.controller.service.targetPorts.http }}
61-
{{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.internal.appProtocol) }}
61+
{{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.internal.appProtocol) }}
62+
{{- if eq .Values.cloudProvider "GCP" }}
63+
appProtocol: HTTP
64+
{{- else }}
6265
appProtocol: http
66+
{{- end }}
6367
{{- end }}
6468
{{- if (and $setNodePorts (not (empty .Values.controller.service.internal.nodePorts.http))) }}
6569
nodePort: {{ .Values.controller.service.internal.nodePorts.http }}
@@ -70,8 +74,12 @@ spec:
7074
port: {{ .Values.controller.service.internal.ports.https | default .Values.controller.service.ports.https }}
7175
protocol: TCP
7276
targetPort: {{ .Values.controller.service.internal.targetPorts.https | default .Values.controller.service.targetPorts.https }}
73-
{{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.internal.appProtocol) }}
77+
{{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.internal.appProtocol) }}
78+
{{- if eq .Values.cloudProvider "GCP" }}
79+
appProtocol: HTTPS
80+
{{- else }}
7481
appProtocol: https
82+
{{- end }}
7583
{{- end }}
7684
{{- if (and $setNodePorts (not (empty .Values.controller.service.internal.nodePorts.https))) }}
7785
nodePort: {{ .Values.controller.service.internal.nodePorts.https }}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ spec:
3131
- name: https-webhook
3232
port: 443
3333
targetPort: webhook
34-
{{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
34+
{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
35+
{{- if eq .Values.cloudProvider "GCP" }}
36+
appProtocol: HTTPS
37+
{{- else }}
3538
appProtocol: https
39+
{{- end }}
3640
{{- end }}
3741
selector:
3842
{{- include "ingress-nginx.selectorLabels" . | nindent 4 }}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ spec:
5858
port: {{ .Values.controller.service.ports.http }}
5959
protocol: TCP
6060
targetPort: {{ .Values.controller.service.targetPorts.http }}
61-
{{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
61+
{{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
62+
{{- if eq .Values.cloudProvider "GCP" }}
63+
appProtocol: HTTP
64+
{{- else }}
6265
appProtocol: http
66+
{{- end }}
6367
{{- end }}
6468
{{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.http))) }}
6569
nodePort: {{ .Values.controller.service.nodePorts.http }}
@@ -70,8 +74,12 @@ spec:
7074
port: {{ .Values.controller.service.ports.https }}
7175
protocol: TCP
7276
targetPort: {{ .Values.controller.service.targetPorts.https }}
73-
{{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
77+
{{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
78+
{{- if eq .Values.cloudProvider "GCP" }}
79+
appProtocol: HTTPS
80+
{{- else }}
7481
appProtocol: https
82+
{{- end }}
7583
{{- end }}
7684
{{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.https))) }}
7785
nodePort: {{ .Values.controller.service.nodePorts.https }}

‎charts/ingress-nginx/templates/default-backend-service.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@ spec:
3232
port: {{ .Values.defaultBackend.service.servicePort }}
3333
protocol: TCP
3434
targetPort: http
35-
{{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
35+
{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
36+
{{- if eq .Values.cloudProvider "GCP" }}
37+
appProtocol: HTTP
38+
{{- else }}
3639
appProtocol: http
40+
{{- end }}
3741
{{- end }}
3842
selector:
3943
{{- include "ingress-nginx.selectorLabels" . | nindent 4 }}

‎charts/ingress-nginx/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,3 +1112,9 @@ portNamePrefix: ""
11121112
# This can be generated with: `openssl dhparam 4096 2> /dev/null | base64`
11131113
## Ref: https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/ssl-dh-param
11141114
dhParam: ""
1115+
1116+
# -- (string) Specify cloud provider which will be used to install chart
1117+
# eg GCP, AWS, Azure ...
1118+
# Some configuration like appProtocol is differet for GCP cloud
1119+
## Ref: https://cloud.google.com/kubernetes-engine/docs/how-to/secure-gateway
1120+
cloudProvider: ""

0 commit comments

Comments
 (0)