Merge branch 'main' into feat-enable-confluence-clustering-by-default

defenseunicorns · Aug 15, 2024 · 63b93ed · 63b93ed
2 parents 299e34e + 9f79b80
commit 63b93ed
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/common/zarf.yaml b/common/zarf.yaml
@@ -16,7 +16,7 @@ components:
       - name: confluence
         namespace: confluence
         url: https://atlassian.github.io/data-center-helm-charts
-        version: "1.20.0"
+        version: "1.21.0"
         repoName: confluence
         releaseName: confluence
         valuesFiles:

diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node
-  tag: "8.9.4"
+  tag: "9.0.2"
 
 monitoring:
   # TODO: Pending an upstream pr to fix jar file location to not be hardcoded:

diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: atlassian/confluence
-  tag: "8.5.12"
+  tag: "9.0.2"
 
 monitoring:
   jmxExporterImageRepo: bitnami/jmx-exporter

diff --git a/zarf.yaml b/zarf.yaml
@@ -36,7 +36,7 @@ components:
         valuesFiles:
           - values/upstream-values.yaml
     images:
-      - atlassian/confluence:8.5.12
+      - atlassian/confluence:9.0.2
       - bitnami/jmx-exporter:1.0.1
 
   - name: confluence
@@ -53,6 +53,6 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node:8.9.4
+      - registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node:9.0.2
       # TODO: Pending an upstream pr to fix jar file location to not be hardcoded:
       # - registry1.dso.mil/ironbank/opensource/prometheus/jmx-exporter:0.20.0