From cd58f6afa50404b6de290620e2286871626cb3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n=20Garc=C3=ADa?=
 <javier.salmeron@broadcom.com>
Date: Tue, 6 May 2025 17:40:37 +0200
Subject: [PATCH] [bitnami/contour] chore: :recycle: :arrow_up: Update common
 and remove k8s < 1.23 references (#33350)

---
 bitnami/contour/CHANGELOG.md                           | 8 ++++++--
 bitnami/contour/Chart.lock                             | 6 +++---
 bitnami/contour/Chart.yaml                             | 2 +-
 bitnami/contour/templates/default-backend/ingress.yaml | 6 +-----
 bitnami/contour/templates/envoy/hpa.yaml               | 8 --------
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/bitnami/contour/CHANGELOG.md b/bitnami/contour/CHANGELOG.md
index 217f5f8cdd..33d626a8ff 100644
--- a/bitnami/contour/CHANGELOG.md
+++ b/bitnami/contour/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 19.5.11 (2025-04-28)
+## 19.5.12 (2025-05-06)
 
-* [bitnami/contour] Release 19.5.11 ([#33207](https://github.com/bitnami/charts/pull/33207))
+* [bitnami/contour] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33350](https://github.com/bitnami/charts/pull/33350))
+
+## <small>19.5.11 (2025-04-28)</small>
+
+* [bitnami/contour] Release 19.5.11 (#33207) ([fba4edd](https://github.com/bitnami/charts/commit/fba4edd4b68eee5305e0919743b805da35bdc9f7)), closes [#33207](https://github.com/bitnami/charts/issues/33207)
 
 ## <small>19.5.10 (2025-04-01)</small>
 
diff --git a/bitnami/contour/Chart.lock b/bitnami/contour/Chart.lock
index f75ea71009..ffc429e421 100644
--- a/bitnami/contour/Chart.lock
+++ b/bitnami/contour/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.30.0
-digest: sha256:46afdf79eae69065904d430f03f7e5b79a148afed20aa45ee83ba88adc036169
-generated: "2025-02-19T13:00:35.464822017Z"
+  version: 2.31.0
+digest: sha256:c4c9af4e0ca23cf2c549e403b2a2bba2c53a3557cee23da09fa4cdf710044c2c
+generated: "2025-05-06T10:01:58.975607597+02:00"
diff --git a/bitnami/contour/Chart.yaml b/bitnami/contour/Chart.yaml
index d6850e8bc7..8159b298d4 100644
--- a/bitnami/contour/Chart.yaml
+++ b/bitnami/contour/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: contour
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/contour
-version: 19.5.11
+version: 19.5.12
diff --git a/bitnami/contour/templates/default-backend/ingress.yaml b/bitnami/contour/templates/default-backend/ingress.yaml
index f8fb490b48..19e8cdf454 100644
--- a/bitnami/contour/templates/default-backend/ingress.yaml
+++ b/bitnami/contour/templates/default-backend/ingress.yaml
@@ -22,7 +22,7 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
     {{- end }}
 spec:
-  {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
+  {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
   rules:
@@ -37,9 +37,7 @@ spec:
           {{- toYaml .Values.ingress.extraPaths | nindent 10 }}
           {{- end }}
           - path: {{ .Values.ingress.path }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
-            {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-default-backend" (include "common.names.fullname" .)) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
@@ -47,9 +45,7 @@ spec:
       http:
         paths:
           - path: {{ default "/" .path }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-default-backend" (include "common.names.fullname" $)) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- if .Values.ingress.extraRules }}
diff --git a/bitnami/contour/templates/envoy/hpa.yaml b/bitnami/contour/templates/envoy/hpa.yaml
index ac419e33aa..f155839afa 100644
--- a/bitnami/contour/templates/envoy/hpa.yaml
+++ b/bitnami/contour/templates/envoy/hpa.yaml
@@ -32,24 +32,16 @@ spec:
     - type: Resource
       resource:
         name: cpu
-        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
-        targetAverageUtilization: {{ .Values.envoy.autoscaling.targetCPU }}
-        {{- else }}
         target:
           type: Utilization
           averageUtilization: {{ .Values.envoy.autoscaling.targetCPU }}
-        {{- end }}
     {{- end }}
     {{- if .Values.envoy.autoscaling.targetMemory }}
     - type: Resource
       resource:
         name: memory
-        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
-        targetAverageUtilization: {{ .Values.envoy.autoscaling.targetMemory }}
-        {{- else }}
         target:
           type: Utilization
           averageUtilization: {{ .Values.envoy.autoscaling.targetMemory }}
-        {{- end }}
     {{- end }}
 {{- end }}