diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 21922fe..c1c75e1 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -47,10 +47,10 @@ jobs: uses: supplypike/setup-bin@v3 with: # renovate: zarf-uri datasource=github-tags depName=defenseunicorns/zarf - uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.31.3/zarf_v0.31.3_Linux_amd64' + uri: 'https://github.com/defenseunicorns/zarf/releases/download/v0.31.4/zarf_v0.31.4_Linux_amd64' name: 'zarf' # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver - version: 'v0.31.3' + version: 'v0.31.4' - name: Build confluence package run: zarf package create --confirm --no-progress diff --git a/Makefile b/Makefile index 0fe71f4..6fec013 100755 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ # The version of Zarf to use. To keep this repo as portable as possible the Zarf binary will be downloaded and added to # the build folder. # renovate: datasource=github-tags depName=defenseunicorns/zarf -ZARF_VERSION := v0.31.3 +ZARF_VERSION := v0.31.4 # The version of the build harness container to use BUILD_HARNESS_REPO := ghcr.io/defenseunicorns/build-harness/build-harness # renovate: datasource=docker depName=ghcr.io/defenseunicorns/build-harness/build-harness -BUILD_HARNESS_VERSION := 1.14.2 +BUILD_HARNESS_VERSION := 1.14.8 # renovate: datasource=docker depName=ghcr.io/defenseunicorns/packages/dubbd-k3d extractVersion=^(?\d+\.\d+\.\d+) -DUBBD_K3D_VERSION := 0.14.0 +DUBBD_K3D_VERSION := 0.16.0 # Figure out which Zarf binary we should use based on the operating system we are on ZARF_BIN := zarf diff --git a/README.md b/README.md index 2a4a7ef..b41bb18 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ metadata: version: 0.0.1 architecture: amd64 -zarf-packages: +packages: - name: confluence repository: ghcr.io/defenseunicorns/uds-capability/confluence ref: x.x.x diff --git a/confluence-flux-values.yaml b/confluence-flux-values.yaml index b060d17..b1767b2 100644 --- a/confluence-flux-values.yaml +++ b/confluence-flux-values.yaml @@ -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.16.6-bb.4 + tag: 1.17.1-bb.0 values: | ###ZARF_VAR_CONFLUENCE_VALUES### dependsOn: diff --git a/zarf.yaml b/zarf.yaml index db4adcf..43d9a4e 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -40,9 +40,9 @@ components: valuesFiles: - confluence-flux-values.yaml repos: - - https://repo1.dso.mil/big-bang/product/community/confluence.git@1.16.6-bb.4 + - https://repo1.dso.mil/big-bang/product/community/confluence.git@1.17.1-bb.0 images: - - registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node:8.6.1 + - registry1.dso.mil/ironbank/atlassian/confluence-data-center/confluence-node:8.7.1 actions: onDeploy: after: