Skip to content

Commit 968542c

Browse files
karolkieglerskidkostyrev
authored andcommitted
Fix-semver (kubernetes#11193)
1 parent d26a6e2 commit 968542c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ 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) }}
6262
appProtocol: http
6363
{{- end }}
6464
{{- if (and $setNodePorts (not (empty .Values.controller.service.internal.nodePorts.http))) }}
@@ -70,7 +70,7 @@ spec:
7070
port: {{ .Values.controller.service.internal.ports.https | default .Values.controller.service.ports.https }}
7171
protocol: TCP
7272
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) }}
73+
{{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.internal.appProtocol) }}
7474
appProtocol: https
7575
{{- end }}
7676
{{- if (and $setNodePorts (not (empty .Values.controller.service.internal.nodePorts.https))) }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ 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 }}
3535
appProtocol: https
3636
{{- end }}
3737
selector:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ 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) }}
6262
appProtocol: http
6363
{{- end }}
6464
{{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.http))) }}
@@ -70,7 +70,7 @@ spec:
7070
port: {{ .Values.controller.service.ports.https }}
7171
protocol: TCP
7272
targetPort: {{ .Values.controller.service.targetPorts.https }}
73-
{{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
73+
{{- if and (semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
7474
appProtocol: https
7575
{{- end }}
7676
{{- if (and $setNodePorts (not (empty .Values.controller.service.nodePorts.https))) }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ 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 }}
3636
appProtocol: http
3737
{{- end }}
3838
selector:

0 commit comments

Comments
 (0)