From 49e975bbbe480136f9460ad72212578741703a54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:35:01 +0000 Subject: [PATCH 1/3] chore(deps): update gitlab package dependencies | datasource | package | from | to | | ---------- | ------------------------------------------------------------------ | --------------------- | --------------------- | | docker | cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips | 17.3.6 | 17.5.1 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-base-fips | 17.3.6 | 17.5.1 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips | 17.3.6 | 17.5.1 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips | 17.3.6 | 17.5.1 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips | 17.3.6 | 17.5.1 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips | 1.31.1 | 1.31.2 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips | 17.3.6 | 17.5.1 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips | 17.3.6 | 17.5.1 | | docker | cgr.dev/du-uds-defenseunicorns/gitlab-workhorse-ee-fips | 17.3.6 | 17.5.1 | | docker | ghcr.io/defenseunicorns/packages/uds/postgres-operator | 1.13.0-uds.2-upstream | 1.13.0-uds.4-upstream | | docker | ghcr.io/defenseunicorns/packages/uds/valkey | 7.2.7-uds.0-upstream | 8.0.1-uds.0-upstream | | docker | registry.gitlab.com/gitlab-org/build/cng/certificates | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitaly | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-base | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-pages | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-shell | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee | v17.3.6 | v17.5.1 | | docker | registry.gitlab.com/gitlab-org/build/cng/kubectl | v17.3.6 | v17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/certificates | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitaly | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse | 17.3.6 | 17.5.1 | | docker | registry1.dso.mil/ironbank/gitlab/gitlab/kubectl | 17.3.6 | 17.5.1 | --- bundle/uds-bundle.yaml | 4 +- values/registry1-values.yaml | 30 +++++++------- values/unicorn-values.yaml | 32 +++++++-------- values/upstream-values.yaml | 32 +++++++-------- zarf.yaml | 76 ++++++++++++++++++------------------ 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 3de4c9cd..30ed033e 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -20,7 +20,7 @@ packages: - name: postgres-operator repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator - ref: 1.13.0-uds.2-upstream + ref: 1.13.0-uds.4-upstream overrides: postgres-operator: uds-postgres-config: @@ -42,7 +42,7 @@ packages: - name: valkey repository: ghcr.io/defenseunicorns/packages/uds/valkey - ref: 7.2.7-uds.0-upstream + ref: 8.0.1-uds.0-upstream overrides: valkey: uds-valkey-config: diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml index 7e53f6c7..8f386b3d 100644 --- a/values/registry1-values.yaml +++ b/values/registry1-values.yaml @@ -5,62 +5,62 @@ gitlab: webservice: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice - tag: 17.3.6 + tag: 17.5.1 workhorse: image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse # renovate: datasource=docker depName=registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse versioning=semver - tag: 17.3.6 + tag: 17.5.1 sidekiq: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq - tag: 17.3.6 + tag: 17.5.1 migrations: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox - tag: 17.3.6 + tag: 17.5.1 gitaly: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly - tag: 17.3.6 + tag: 17.5.1 gitlab-exporter: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter - tag: 17.3.6 + tag: 17.5.1 gitlab-pages: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages - tag: 17.3.6 + tag: 17.5.1 gitlab-shell: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell - tag: 17.3.6 + tag: 17.5.1 praefect: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly - tag: 17.3.6 + tag: 17.5.1 toolbox: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox - tag: 17.3.6 + tag: 17.5.1 global: certificates: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/certificates - tag: 17.3.6 + tag: 17.5.1 gitlabBase: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base - tag: 17.3.6 + tag: 17.5.1 kubectl: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl - tag: 17.3.6 + tag: 17.5.1 registry: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry - tag: 17.3.6 + tag: 17.5.1 shared-secrets: selfsign: @@ -71,4 +71,4 @@ shared-secrets: upgradeCheck: image: repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base - tag: 17.3.6 + tag: 17.5.1 diff --git a/values/unicorn-values.yaml b/values/unicorn-values.yaml index a842c1bb..4c08d2bc 100644 --- a/values/unicorn-values.yaml +++ b/values/unicorn-values.yaml @@ -5,69 +5,69 @@ gitlab: webservice: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee - tag: v17.3.6 + tag: v17.5.1 workhorse: image: registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee # renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/gitlab-workhorse-ee-fips versioning=semver - tag: v17.3.6 + tag: 17.5.1 sidekiq: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee - tag: v17.3.6 + tag: v17.5.1 migrations: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee - tag: v17.3.6 + tag: v17.5.1 gitaly: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitaly - tag: v17.3.6 + tag: v17.5.1 gitlab-exporter: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips - tag: 17.3.6 + tag: 17.5.1 gitlab-pages: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips - tag: 17.3.6 + tag: 17.5.1 gitlab-shell: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips - tag: 17.3.6 + tag: 17.5.1 praefect: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitaly - tag: v17.3.6 + tag: v17.5.1 toolbox: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee - tag: v17.3.6 + tag: v17.5.1 global: certificates: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips - tag: 17.3.6 + tag: 17.5.1 gitlabBase: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips - tag: 17.3.6 + tag: 17.5.1 kubectl: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips - tag: 1.31.1 + tag: 1.31.2 registry: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips - tag: 17.3.6 + tag: 17.5.1 shared-secrets: selfsign: image: repository: cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips - tag: 17.3.6 + tag: 17.5.1 upgradeCheck: image: repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips - tag: 17.3.6 + tag: 17.5.1 diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml index 09cc0f68..f8df2270 100644 --- a/values/upstream-values.yaml +++ b/values/upstream-values.yaml @@ -5,70 +5,70 @@ gitlab: webservice: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee - tag: v17.3.6 + tag: v17.5.1 workhorse: image: registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee # renovate: datasource=docker depName=registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee versioning=semver - tag: v17.3.6 + tag: v17.5.1 sidekiq: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee - tag: v17.3.6 + tag: v17.5.1 migrations: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee - tag: v17.3.6 + tag: v17.5.1 gitaly: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitaly - tag: v17.3.6 + tag: v17.5.1 gitlab-exporter: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter - tag: v17.3.6 + tag: v17.5.1 gitlab-pages: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages - tag: v17.3.6 + tag: v17.5.1 gitlab-shell: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell - tag: v17.3.6 + tag: v17.5.1 praefect: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitaly - tag: v17.3.6 + tag: v17.5.1 toolbox: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee - tag: v17.3.6 + tag: v17.5.1 global: certificates: image: repository: registry.gitlab.com/gitlab-org/build/cng/certificates - tag: v17.3.6 + tag: v17.5.1 gitlabBase: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base - tag: v17.3.6 + tag: v17.5.1 kubectl: image: repository: registry.gitlab.com/gitlab-org/build/cng/kubectl - tag: v17.3.6 + tag: v17.5.1 registry: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry - tag: v17.3.6 + tag: v17.5.1 shared-secrets: selfsign: image: repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign - tag: v17.3.6 + tag: v17.5.1 upgradeCheck: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base - tag: v17.3.6 + tag: v17.5.1 diff --git a/zarf.yaml b/zarf.yaml index a7fe9e70..6bb22a3f 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -53,19 +53,19 @@ components: valuesFiles: - values/registry1-values.yaml images: - - "registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.3.6" + - "registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.5.1" - "registry1.dso.mil/ironbank/gitlab/gitlab/cfssl-self-sign:1.6.1" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitaly:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base:17.3.6" - - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.3.6" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitaly:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base:17.5.1" + - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.5.1" # Note: upstream flavor is experimental - name: gitlab @@ -83,19 +83,19 @@ components: valuesFiles: - values/upstream-values.yaml images: - - "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.3.6" + - "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.5.1" # Note: unicorn flavor is experimental - name: gitlab @@ -113,16 +113,16 @@ components: valuesFiles: - values/unicorn-values.yaml images: - - "cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips:17.3.6" - - "cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips:17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.3.6" - - "cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips:17.3.6" - - "cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips:17.3.6" - - "cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips:17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.3.6" - - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.3.6" - - "cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips:1.31.1" - - "cgr.dev/du-uds-defenseunicorns/gitlab-base-fips:17.3.6" - - "cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips:17.3.6" + - "cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips:17.5.1" + - "cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips:17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.5.1" + - "cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips:17.5.1" + - "cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips:17.5.1" + - "cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips:17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.5.1" + - "cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips:1.31.2" + - "cgr.dev/du-uds-defenseunicorns/gitlab-base-fips:17.5.1" + - "cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips:17.5.1" From 24aa270528872936d19094c5ee80b14190c54540 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Tue, 5 Nov 2024 14:03:44 -0700 Subject: [PATCH 2/3] fix unicorn-values.yaml renovate workhorse --- values/unicorn-values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values/unicorn-values.yaml b/values/unicorn-values.yaml index 4c08d2bc..3642c035 100644 --- a/values/unicorn-values.yaml +++ b/values/unicorn-values.yaml @@ -8,8 +8,8 @@ gitlab: tag: v17.5.1 workhorse: image: registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee - # renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/gitlab-workhorse-ee-fips versioning=semver - tag: 17.5.1 + # renovate: datasource=docker depName=registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee versioning=semver + tag: v17.5.1 sidekiq: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee From b1d78797569b7c848ac8abf086c46d235be0f651 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Tue, 5 Nov 2024 15:32:17 -0700 Subject: [PATCH 3/3] revert unicorn to upstream only --- values/unicorn-values.yaml | 37 +++++++++++++++++++------------------ zarf.yaml | 16 ++++++++-------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/values/unicorn-values.yaml b/values/unicorn-values.yaml index 3642c035..f8df2270 100644 --- a/values/unicorn-values.yaml +++ b/values/unicorn-values.yaml @@ -24,16 +24,16 @@ gitlab: tag: v17.5.1 gitlab-exporter: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter + tag: v17.5.1 gitlab-pages: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages + tag: v17.5.1 gitlab-shell: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell + tag: v17.5.1 praefect: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitaly @@ -42,32 +42,33 @@ gitlab: image: repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee tag: v17.5.1 + global: certificates: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/certificates + tag: v17.5.1 gitlabBase: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base + tag: v17.5.1 kubectl: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips - tag: 1.31.2 + repository: registry.gitlab.com/gitlab-org/build/cng/kubectl + tag: v17.5.1 registry: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry + tag: v17.5.1 shared-secrets: selfsign: image: - repository: cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign + tag: v17.5.1 upgradeCheck: image: - repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips - tag: 17.5.1 + repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base + tag: v17.5.1 diff --git a/zarf.yaml b/zarf.yaml index 6bb22a3f..3dba6bb0 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -113,16 +113,16 @@ components: valuesFiles: - values/unicorn-values.yaml images: - - "cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips:17.5.1" - - "cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips:17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.5.1" - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.5.1" - - "cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips:17.5.1" - - "cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips:17.5.1" - - "cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips:17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.5.1" - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.5.1" - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.5.1" - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.5.1" - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.5.1" - - "cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips:1.31.2" - - "cgr.dev/du-uds-defenseunicorns/gitlab-base-fips:17.5.1" - - "cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips:17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.5.1" + - "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.5.1"