feat: enable confluence & update to v8.9.4 (#193)

* feat: re-enable confluence * fix: removed duplicate netpol
defenseunicorns · Sep 26, 2024 · 97c9207 · 97c9207
1 parent c1b4efc
commit 97c9207
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 77 deletions.
diff --git a/bundles/uds-core-swf/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml
@@ -561,14 +561,6 @@ packages:
               value: "###ZARF_VAR_JIRA_DB_USERNAME###"
             - path: postgres.password
               value: "###ZARF_VAR_JIRA_DB_PASSWORD###"
-            - path: custom  # To setup custom egress rule to reach DB.
-              value:
-                - direction: Egress
-                  port: 5432
-                  selector:
-                    app.kubernetes.io/name: jira
-                  remoteGenerated: Anywhere
-                  description: "Egress to Postgres"
         jira:
           variables:
             - name: JIRA_LOCAL_HOME_ENABLED
@@ -596,41 +588,44 @@ packages:
                 jvm:
                   maxHeap: "6g"
 
-  # # Confluence
-  # - name: confluence-database-secret
-  #   path: ../../build
-  #   ref: 0.0.1
-
-  # - name: confluence
-  #   repository: ghcr.io/defenseunicorns/packages/uds/confluence
-  #   ref: 1.18.0-uds.0-registry1
-  #   overrides:
-  #     confluence:
-  #       confluence:
-  #         variables:
-  #           - name: CONFLUENCE_LOCAL_HOME_ENABLED
-  #             path: "volumes.localHome.persistentVolumeClaim.create"
-  #             description: "Local Home Toggle"
-  #             default: "true"
-  #           - name: CONFLUENCE_RWO_STORAGE_CLASS
-  #             path: "volumes.localHome.persistentVolumeClaim.storageClassName"
-  #             description: "RWO storage class name"
-  #           - name: CONFLUENCE_LOCAL_HOME_SIZE
-  #             path: "volumes.localHome.persistentVolumeClaim.resources.requests.storage"
-  #             description: "Storage size"
-  #             default: "128Gi"
-  #           - name: CONFLUENCE_RESOURCE_CONFIG
-  #             path: "confluence.resources"
-  #             default:
-  #               container:
-  #                 requests:
-  #                   cpu: "2"
-  #                   memory: "2Gi"
-  #                 limits:
-  #                   cpu: "4"
-  #                   memory: "8Gi"
-  #               jvm:
-  #                 maxHeap: "4g"
+  - name: confluence
+    repository: ghcr.io/defenseunicorns/packages/uds/confluence
+    ref: 1.20.0-uds.3-registry1
+    overrides:
+      confluence:
+        uds-confluence-config:
+          values:
+            - path: postgres.internal
+              value: false
+            - path: postgres.username
+              value: "###ZARF_VAR_CONFLUENCE_DB_USERNAME###"
+            - path: postgres.password
+              value: "###ZARF_VAR_CONFLUENCE_DB_PASSWORD###"
+        confluence:
+          variables:
+            - name: CONFLUENCE_LOCAL_HOME_ENABLED
+              path: "volumes.localHome.persistentVolumeClaim.create"
+              description: "Local Home Toggle"
+              default: "true"
+            - name: CONFLUENCE_RWO_STORAGE_CLASS
+              path: "volumes.localHome.persistentVolumeClaim.storageClassName"
+              description: "RWO storage class name"
+            - name: CONFLUENCE_LOCAL_HOME_SIZE
+              path: "volumes.localHome.persistentVolumeClaim.resources.requests.storage"
+              description: "Storage size"
+              default: "128Gi"
+            - name: CONFLUENCE_RESOURCE_CONFIG
+              path: "confluence.resources"
+              default:
+                container:
+                  requests:
+                    cpu: "2"
+                    memory: "2Gi"
+                  limits:
+                    cpu: "4"
+                    memory: "8Gi"
+                jvm:
+                  maxHeap: "6g"
 
   # # Mattermost
   # - name: mattermost

diff --git a/config/uds-config.yaml b/config/uds-config.yaml
@@ -153,13 +153,10 @@ variables:
     JIRA_DB_USERNAME: "postgres"
     JIRA_DB_PASSWORD: "replace-me-db-passwords"
     JIRA_DB_ENDPOINT: "jira-pg.replace.with.db.url"
-  confluence-database-secret:
-    CONFLUENCE_DB_PASSWORD: "replace-me-db-passwords"
   confluence:
     CONFLUENCE_DB_NAME: "confluencedb"
     CONFLUENCE_DB_USERNAME: "postgres"
-    CONFLUENCE_LOCAL_HOME_ENABLED: "true"
-    CONFLUENCE_LOCAL_HOME_SIZE: "128Gi"
+    CONFLUENCE_DB_PASSWORD: "replace-me-db-passwords"
     CONFLUENCE_DB_ENDPOINT: "confluence-pg.replace.with.db.url"
   mattermost:
     ACCESS_KEY: "replace-me-object-store-access-key"

diff --git a/docs/packages-and-dependencies.md b/docs/packages-and-dependencies.md
@@ -45,8 +45,8 @@ The UDS Software Factory Bundle (SWF) is a collection of Zarf packages which inc
 | [Gitlab](https://github.com/defenseunicorns/uds-package-gitlab) | v17.1.2-uds.0-registry1 | 17.1.2 | A source control management tool used in the software development lifecycle for storing, updating, building and deploying custom software |
 | [Gitlab Runner](https://github.com/defenseunicorns/uds-package-gitlab-runner) | 17.0.0-uds.0-registry1 | v17.0.0 | A counterpart to Gitlab (above) in which automated software builds, tests and deployments are executed |
 | [Sonarqube](https://github.com/defenseunicorns/uds-package-sonarqube) | 8.0.3-uds.6-registry1 | 9.9.3-community | A code inspection tool used during automated pipelines to evaluate security considerations of custom software and packaged images |
-| [Jira](https://github.com/defenseunicorns/uds-package-jira) | 1.22.0-uds.0-registry1 | 10.0.1 | A collaboration tool used for team management and task organization |
-| [Confluence](https://github.com/defenseunicorns/uds-package-confluence) | 1.18.0-uds.0-registry1 | 8.8.0 | A knowledge management tool used by teams to organize information |
+| [Jira](https://github.com/defenseunicorns/uds-package-jira) | 1.22.0-uds.0-registry1 | 10.0.1 | A collaboration tool used for team management and task organization |s
+| [Confluence](https://github.com/defenseunicorns/uds-package-confluence) | 1.20.0-uds.0-registry1 | 8.9.4 | A knowledge management tool used by teams to organize information |
 | [Mattermost](https://github.com/defenseunicorns/uds-package-mattermost) | 9.7.2-uds.0-registry1 | 9.7.2 | An instance of Mattermost, a self-hosted chat and collaboration platform |
 | [Nexus](https://github.com/defenseunicorns/uds-package-nexus) | 3.69.0-uds.0-registry1 | 3.69.0-02 | An artifact repository used for storing compiled application libraries, packages, images and other such artifacts |
 | [cert-manager](https://cert-manager.io/) | 0.0.1 | 1.14.5 | Tool for automating management of in-cluster certificates |

diff --git a/packages/databases/confluence/secret/secret.yaml b/packages/databases/confluence/secret/secret.yaml
diff --git a/packages/databases/confluence/secret/zarf.yaml b/packages/databases/confluence/secret/zarf.yaml
diff --git a/tasks/create.yaml b/tasks/create.yaml
@@ -21,7 +21,6 @@ tasks:
   - name: database-manifest-packages
     description: Create database manifest packages
     actions:
-      - cmd: ./uds zarf package create ./packages/databases/confluence/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
       - cmd: ./uds zarf package create ./packages/databases/gitlab/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
       - cmd: ./uds zarf package create ./packages/databases/sonarqube/secret --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build