diff --git a/bitnami/wildfly/CHANGELOG.md b/bitnami/wildfly/CHANGELOG.md index c8b222e0cb..e47b2d9631 100644 --- a/bitnami/wildfly/CHANGELOG.md +++ b/bitnami/wildfly/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 20.2.4 (2024-06-06) +## 20.2.5 (2024-06-10) -* [bitnami/wildfly] Release 20.2.4 ([#27027](https://github.com/bitnami/charts/pull/27027)) +* [bitnami/wildfly] Fix ingress annotations ([#25958](https://github.com/bitnami/charts/pull/25958)) + +## 20.2.4 (2024-06-06) + +* [bitnami/wildfly] Release 20.2.4 (#27027) ([3d2cb80](https://github.com/bitnami/charts/commit/3d2cb807f24429619535bad3dc3bf3c8949e9022)), closes [#27027](https://github.com/bitnami/charts/issues/27027) ## 20.2.3 (2024-06-04) diff --git a/bitnami/wildfly/Chart.yaml b/bitnami/wildfly/Chart.yaml index 9976b8bf20..bc89309652 100644 --- a/bitnami/wildfly/Chart.yaml +++ b/bitnami/wildfly/Chart.yaml @@ -33,4 +33,4 @@ maintainers: name: wildfly sources: - https://github.com/bitnami/charts/tree/main/bitnami/wildfly -version: 20.2.4 +version: 20.2.5 diff --git a/bitnami/wildfly/templates/ingress.yaml b/bitnami/wildfly/templates/ingress.yaml index 5ac61b5017..e44aa02fe1 100644 --- a/bitnami/wildfly/templates/ingress.yaml +++ b/bitnami/wildfly/templates/ingress.yaml @@ -16,7 +16,7 @@ metadata: kubernetes.io/tls-acme: "true" {{- end }} {{- if or .Values.ingress.annotations .Values.commonAnnotations }} - {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.persistence.annotations .Values.commonAnnotations ) "context" . ) }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} {{- end }}