From c928208eb9db76821f61fad8f2995b38d11a7ad9 Mon Sep 17 00:00:00 2001 From: Steve Hipwell Date: Mon, 12 Feb 2024 10:51:23 +0000 Subject: [PATCH] feat(confluence-server): Updated image to v8.5.6 (#883) Signed-off-by: Steve Hipwell --- charts/confluence-server/CHANGELOG.md | 9 +++++++++ charts/confluence-server/Chart.yaml | 6 +++--- charts/confluence-server/templates/_helpers.tpl | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/charts/confluence-server/CHANGELOG.md b/charts/confluence-server/CHANGELOG.md index 22cdf1ac..336fed44 100644 --- a/charts/confluence-server/CHANGELOG.md +++ b/charts/confluence-server/CHANGELOG.md @@ -60,6 +60,15 @@ - Updated the _Confluence Server_ OCI image to [v8.6.0](https://confluence.atlassian.com/doc/confluence-8-6-release-notes-1289421595.html). - Updated the embedded _PostgreSQL_ chart to [v12.12.10](https://artifacthub.io/packages/helm/bitnami/postgresql/12.12.10) (PostgreSQL v15.4.0). +## [v5.5.6] - 2024-02-12 + +> [!IMPORTANT] +> _Confluence_ [v8.5](https://confluence.atlassian.com/doc/confluence-8-5-release-notes-1252010185.html) is the last LTS release that supports the _Confluence Server_ licence. + +### Changed + +- Updated the _Confluence Server_ OCI image to [v8.5.6](https://confluence.atlassian.com/doc/confluence-8-5-release-notes-1252010185.html); this changes the JDK version to `v17`. + ## [v5.5.5] - 2024-01-23 > [!IMPORTANT] diff --git a/charts/confluence-server/Chart.yaml b/charts/confluence-server/Chart.yaml index eeaa419c..ab24a539 100644 --- a/charts/confluence-server/Chart.yaml +++ b/charts/confluence-server/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: confluence-server description: Helm chart for Atlassian Confluence Server. type: application -version: 5.7.1 -appVersion: 8.7.2 +version: 5.5.6 +appVersion: 8.5.6 home: https://www.atlassian.com/software/confluence icon: https://is2-ssl.mzstatic.com/image/thumb/Purple113/v4/f6/1f/d8/f61fd8a9-5451-cd1a-8ef0-5b865999bacb/source/256x256bb.jpg keywords: @@ -29,4 +29,4 @@ annotations: artifacthub.io/alternativeName: confluence artifacthub.io/changes: | - kind: changed - description: "Updated the _Confluence Server_ OCI image to [v8.7.2](https://confluence.atlassian.com/doc/confluence-8-7-release-notes-1318391277.html)." + description: "Updated the _Confluence Server_ OCI image to [v8.5.6](https://confluence.atlassian.com/doc/confluence-8-5-release-notes-1252010185.html); this changes the JDK version to `v17`." diff --git a/charts/confluence-server/templates/_helpers.tpl b/charts/confluence-server/templates/_helpers.tpl index b475fbd5..7119bb5d 100644 --- a/charts/confluence-server/templates/_helpers.tpl +++ b/charts/confluence-server/templates/_helpers.tpl @@ -69,7 +69,7 @@ Create the name of the service account to use The image to use */}} {{- define "confluence-server.image" -}} -{{- printf "%s:%s" .Values.image.repository (default (printf "%s-jdk11" .Chart.AppVersion) .Values.image.tag) }} +{{- printf "%s:%s" .Values.image.repository (default (printf "%s-jdk17" .Chart.AppVersion) .Values.image.tag) }} {{- end }}