From 427956504984655a73ea8bd2a6589d323ef6af8c Mon Sep 17 00:00:00 2001
From: Justen Mehl <justen.t.mehl.civ@us.navy.mil>
Date: Wed, 6 Sep 2023 10:58:09 -0400
Subject: [PATCH 1/2] fix templating issue

---
 chart/templates/statefulset.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml
index 1be8e8c..181e2f2 100644
--- a/chart/templates/statefulset.yaml
+++ b/chart/templates/statefulset.yaml
@@ -204,7 +204,6 @@ spec:
       volumes:
         {{ include "fluentd.config.volume" . | nindent 8 }}
         {{ include "common.jmx.config.volume" . | nindent 8 }}
-        {{ include "confluence.volumeClaimTemplates" . | nindent 2 }}
         {{- range $i, $n := .Values.additionalFiles }}
         - name: {{ .name }}-{{$i}}
           {{ .type }}:
@@ -229,3 +228,4 @@ spec:
         {{- with .Values.initcontainervolumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{ include "confluence.volumeClaimTemplates" . | nindent 2 }}
-- 
GitLab


From 01ee289208904a4ac2f59101414ea7b061290486 Mon Sep 17 00:00:00 2001
From: Justen Mehl <justen.t.mehl.civ@us.navy.mil>
Date: Wed, 6 Sep 2023 10:59:57 -0400
Subject: [PATCH 2/2] add upstream modification notes [skip ci]

---
 docs/DEVELOPMENT_MAINTENANCE.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/DEVELOPMENT_MAINTENANCE.md b/docs/DEVELOPMENT_MAINTENANCE.md
index 60756aa..692f9c6 100644
--- a/docs/DEVELOPMENT_MAINTENANCE.md
+++ b/docs/DEVELOPMENT_MAINTENANCE.md
@@ -27,4 +27,14 @@ istio:
 1. Ensure that Confluence Pod (ie. confluence-0) is up and running successfully.
 2. Navigate to Confluence (confluencek.bigbang.dev OR port forwarding if you did not enable istio) and validate you are prompted to enter a license.
 3. You can obtain a trial license quickly here: https://my.atlassian.com/license/evaluation?_ga=2.40938405.644877387.1570464610-1349982554.1568648451
-4. Validate that you can create and edit a post.
\ No newline at end of file
+4. Validate that you can create and edit a post.
+
+
+# Modifications made to upstream chart
+This is a high-level list of modifications that Big Bang has made to the upstream helm chart. You can use this as as cross-check to make sure that no modifications were lost during the upgrade process.
+
+## chart/templates/statefulset.yaml
+- move `include "confluence.volumeClaimTemplates"` line to resolve template rendering issue
+
+## chart/templates/config-jvm.yaml
+- add `-` indention to `include "confluence.sysprop.s3Config"` line to resolve template rendering issue
\ No newline at end of file
-- 
GitLab