From c6d99763f46a2e590d1f113f39133dd78cd507a0 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 12:11:15 +0200
Subject: [PATCH] [bitnami/zipkin] chore: :recycle: :arrow_up: Update common
 and remove k8s < 1.23 references (#33450)

---
 bitnami/zipkin/CHANGELOG.md           | 8 ++++++--
 bitnami/zipkin/Chart.lock             | 6 +++---
 bitnami/zipkin/Chart.yaml             | 2 +-
 bitnami/zipkin/templates/hpa.yaml     | 8 --------
 bitnami/zipkin/templates/ingress.yaml | 8 +-------
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/bitnami/zipkin/CHANGELOG.md b/bitnami/zipkin/CHANGELOG.md
index 015d9ec026..d76a0f0a06 100644
--- a/bitnami/zipkin/CHANGELOG.md
+++ b/bitnami/zipkin/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 1.3.3 (2025-04-27)
+## 1.3.4 (2025-05-06)
 
-* [bitnami/zipkin] Release 1.3.3 ([#33199](https://github.com/bitnami/charts/pull/33199))
+* [bitnami/zipkin] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33450](https://github.com/bitnami/charts/pull/33450))
+
+## <small>1.3.3 (2025-04-27)</small>
+
+* [bitnami/zipkin] Release 1.3.3 (#33199) ([2c6e421](https://github.com/bitnami/charts/commit/2c6e421d6500787ff96e29da085f42abc5ba074c)), closes [#33199](https://github.com/bitnami/charts/issues/33199)
 
 ## <small>1.3.2 (2025-04-17)</small>
 
diff --git a/bitnami/zipkin/Chart.lock b/bitnami/zipkin/Chart.lock
index 60de165e69..a5503592ac 100644
--- a/bitnami/zipkin/Chart.lock
+++ b/bitnami/zipkin/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 12.3.5
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.30.0
-digest: sha256:a2c2e139a194aaa98cecd70f0627d3d793508362b4d7607e3bd6f1e8a8db4d2c
-generated: "2025-04-27T21:01:53.508622981Z"
+  version: 2.31.0
+digest: sha256:1f1fc68c858ff81ca7d67353759854fbdbb358ccf1b0bb613abff48856692dc4
+generated: "2025-05-06T11:16:01.955320193+02:00"
diff --git a/bitnami/zipkin/Chart.yaml b/bitnami/zipkin/Chart.yaml
index 4965deeda3..7dd195f545 100644
--- a/bitnami/zipkin/Chart.yaml
+++ b/bitnami/zipkin/Chart.yaml
@@ -36,4 +36,4 @@ sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/zipkin
 - https://github.com/bitnami/containers/tree/main/bitnami/zipkin
 - https://github.com/openzipkin/zipkin
-version: 1.3.3
+version: 1.3.4
diff --git a/bitnami/zipkin/templates/hpa.yaml b/bitnami/zipkin/templates/hpa.yaml
index 8313b02ea2..af97c8ed66 100644
--- a/bitnami/zipkin/templates/hpa.yaml
+++ b/bitnami/zipkin/templates/hpa.yaml
@@ -27,24 +27,16 @@ spec:
     - type: Resource
       resource:
         name: memory
-        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
-        targetAverageUtilization: {{ .Values.autoscaling.hpa.targetMemory  }}
-        {{- else }}
         target:
           type: Utilization
           averageUtilization: {{ .Values.autoscaling.hpa.targetMemory }}
-        {{- end }}
     {{- end }}
     {{- if .Values.autoscaling.hpa.targetCPU }}
     - type: Resource
       resource:
         name: cpu
-        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
-        targetAverageUtilization: {{ .Values.autoscaling.hpa.targetCPU }}
-        {{- else }}
         target:
           type: Utilization
           averageUtilization: {{ .Values.autoscaling.hpa.targetCPU }}
-        {{- end }}
     {{- end }}
 {{- end }}
diff --git a/bitnami/zipkin/templates/ingress.yaml b/bitnami/zipkin/templates/ingress.yaml
index aae1364e0a..1470beba09 100644
--- a/bitnami/zipkin/templates/ingress.yaml
+++ b/bitnami/zipkin/templates/ingress.yaml
@@ -17,7 +17,7 @@ metadata:
   annotations: {{- 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:
@@ -29,9 +29,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" (include "common.names.fullname" .) "servicePort" (ternary "https" "http" .Values.tls.enabled) "context" $)  | nindent 14 }}
     {{- else if .Values.ingress.path }}
     - http:
@@ -40,9 +38,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" (include "common.names.fullname" .) "servicePort" (ternary "https" "http" .Values.tls.enabled) "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
@@ -50,9 +46,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" (include "common.names.fullname" $) "servicePort" (ternary "https" "http" .Values.tls.enabled) "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.ingress.extraRules }}