[bitnami/contour] Fix useHostPort backwards compatibility (#21033)

* [bitnami/contour] Fix useHostPort backwards compatibility

Signed-off-by: Jose Antonio Carmona <jcarmona@vmware.com>

* Fix brackets

Signed-off-by: Jose Antonio Carmona <jcarmona@vmware.com>

---------

Signed-off-by: Jose Antonio Carmona <jcarmona@vmware.com>
This commit is contained in:
Jose Antonio Carmona
2023-11-17 14:04:45 +01:00
committed by GitHub
parent e8ac63a5a8
commit ea196bd596
3 changed files with 7 additions and 7 deletions

View File

@@ -32,4 +32,4 @@ maintainers:
name: contour
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/contour
version: 14.2.2
version: 14.2.3

View File

@@ -163,7 +163,7 @@ spec:
ports:
- containerPort: {{ .Values.envoy.containerPorts.http }}
# Use of .Values.envoy.useHostPort as boolean is DEPRECATED. Support will be removed in upcoming versions.
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) .Values.envoy.useHostPort.http }}
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) (and (kindIs "map" .Values.envoy.useHostPort) .Values.envoy.useHostPort.http) }}
hostPort: {{ .Values.envoy.hostPorts.http }}
{{- end }}
{{- if .Values.envoy.useHostIP }}
@@ -173,7 +173,7 @@ spec:
protocol: TCP
- containerPort: {{ .Values.envoy.containerPorts.https }}
# Use of .Values.envoy.useHostPort as boolean is DEPRECATED. Support will be removed in upcoming versions.
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) .Values.envoy.useHostPort.https }}
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) (and (kindIs "map" .Values.envoy.useHostPort) .Values.envoy.useHostPort.https) }}
hostPort: {{ .Values.envoy.hostPorts.https }}
{{- end }}
{{- if .Values.envoy.useHostIP }}
@@ -183,7 +183,7 @@ spec:
protocol: TCP
- containerPort: {{ .Values.envoy.containerPorts.metrics }}
# Use of .Values.envoy.useHostPort as boolean is DEPRECATED. Support will be removed in upcoming versions.
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) .Values.envoy.useHostPort.metrics }}
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) (and (kindIs "map" .Values.envoy.useHostPort) .Values.envoy.useHostPort.metrics) }}
hostPort: {{ .Values.envoy.hostPorts.metrics }}
{{- end }}
{{- if .Values.envoy.useHostIP }}

View File

@@ -173,7 +173,7 @@ spec:
ports:
- containerPort: {{ .Values.envoy.containerPorts.http }}
# Use of .Values.envoy.useHostPort as boolean is DEPRECATED. Support will be removed in upcoming versions.
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) .Values.envoy.useHostPort.http }}
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) (and (kindIs "map" .Values.envoy.useHostPort) .Values.envoy.useHostPort.http) }}
hostPort: {{ .Values.envoy.hostPorts.http }}
{{- end }}
{{- if .Values.envoy.useHostIP }}
@@ -183,7 +183,7 @@ spec:
protocol: TCP
- containerPort: {{ .Values.envoy.containerPorts.https }}
# Use of .Values.envoy.useHostPort as boolean is DEPRECATED. Support will be removed in upcoming versions.
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) .Values.envoy.useHostPort.https }}
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) (and (kindIs "map" .Values.envoy.useHostPort) .Values.envoy.useHostPort.https) }}
hostPort: {{ .Values.envoy.hostPorts.https }}
{{- end }}
{{- if .Values.envoy.useHostIP }}
@@ -193,7 +193,7 @@ spec:
protocol: TCP
- containerPort: {{ .Values.envoy.containerPorts.metrics }}
# Use of .Values.envoy.useHostPort as boolean is DEPRECATED. Support will be removed in upcoming versions.
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) .Values.envoy.useHostPort.metrics }}
{{- if or (and (kindIs "boolean" .Values.envoy.useHostPort) .Values.envoy.useHostPort) (and (kindIs "map" .Values.envoy.useHostPort) .Values.envoy.useHostPort.metrics) }}
hostPort: {{ .Values.envoy.hostPorts.metrics }}
{{- end }}
{{- if .Values.envoy.useHostIP }}