Skip to content
This repository has been archived by the owner on Oct 8, 2024. It is now read-only.

Commit

Permalink
Upgrade and make db username configurable (#10)
Browse files Browse the repository at this point in the history
* Upgrade confluence to 1.15.0-bb.7

* Update to make db username configurable
  • Loading branch information
anthonywendt authored Oct 31, 2023
1 parent 7185083 commit c2b8236
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions confluence-flux-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ application:
repository: https://repo1.dso.mil/big-bang/product/community/confluence.git
ref:
# renovate: datasource=gitlab-tags depName=big-bang/product/community/confluence versioning=loose registryUrl=https://repo1.dso.mil
tag: 1.15.0-bb.6
tag: 1.15.0-bb.7
values: |
###ZARF_VAR_CONFLUENCE_VALUES###
dependsOn:
Expand Down Expand Up @@ -50,7 +50,7 @@ application:
- name: ATL_JDBC_URL
value: "jdbc:postgresql://confluence-postgres.confluence.svc.cluster.local:5432/confluencedb"
- name: ATL_JDBC_USER
value: "confluence"
value: ###ZARF_VAR_CONFLUENCE_DB_USERNAME###
- name: ATL_JDBC_PASSWORD
valueFrom:
secretKeyRef:
Expand Down
8 changes: 5 additions & 3 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ kind: ZarfPackageConfig
metadata:
name: confluence
description: "UDS confluence capability deployed via flux"
version: "0.0.3"
version: "0.0.4"
architecture: amd64

variables:
- name: CONFLUENCE_DEPENDS_ON
default: "[]"
- name: CONFLUENCE_CREATE_NAMESPACE
default: "false"
- name: CONFLUENCE_DB_USERNAME
default: "confluence"
- name: DOMAIN
default: "bigbang.dev"

Expand All @@ -34,9 +36,9 @@ components:
valuesFiles:
- confluence-flux-values.yaml
repos:
- https://repo1.dso.mil/big-bang/product/community/[email protected].6
- https://repo1.dso.mil/big-bang/product/community/[email protected].7
images:
- registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node:8.4.0
- registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node:8.6.0
- registry1.dso.mil/ironbank/big-bang/base:2.0.0
actions:
onDeploy:
Expand Down

0 comments on commit c2b8236

Please sign in to comment.