From dbd955b9a95a1a25e6f1cd459b8e90f47f677c84 Mon Sep 17 00:00:00 2001
From: zamaz <71521611+zachariahmiller@users.noreply.github.com>
Date: Thu, 8 Aug 2024 12:43:19 -0400
Subject: [PATCH] fix: update chart and swap images to fix update (#188)

## Description

update chart to correct version and swap ubi images with gitlab-base


## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [x] Test, docs, adr added or updated as needed
- [x] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-package-gitlab/blob/main/CONTRIBUTING.md#developer-workflow)
followed

Release-As: 17.2.1-uds.1
---
 common/zarf.yaml             | 2 +-
 values/registry1-values.yaml | 8 ++++----
 values/upstream-values.yaml  | 8 ++++----
 zarf.yaml                    | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/zarf.yaml b/common/zarf.yaml
index b9b4dbbf..bcee5020 100644
--- a/common/zarf.yaml
+++ b/common/zarf.yaml
@@ -16,7 +16,7 @@ components:
         namespace: gitlab
         url: https://charts.gitlab.io/
         gitPath: chart
-        version: "8.1.3"
+        version: "8.2.1"
         valuesFiles:
           - ../values/common-values.yaml
     actions:
diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml
index fa9a72e9..2c9b9959 100644
--- a/values/registry1-values.yaml
+++ b/values/registry1-values.yaml
@@ -47,8 +47,8 @@ global:
       tag: 17.2.1
   gitlabBase:
     image:
-      repository: registry1.dso.mil/ironbank/redhat/ubi/ubi9
-      tag: "9.4"
+      repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
+      tag: 17.2.1
   kubectl:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl
@@ -67,5 +67,5 @@ shared-secrets:
 
 upgradeCheck:
   image:
-    repository: registry1.dso.mil/ironbank/redhat/ubi/ubi9
-    tag: "9.4"
+    repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
+    tag: 17.2.1
diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml
index 3bb44a98..016d322e 100644
--- a/values/upstream-values.yaml
+++ b/values/upstream-values.yaml
@@ -47,8 +47,8 @@ global:
       tag: v17.2.1
   gitlabBase:
     image:
-      repository: docker.io/redhat/ubi9
-      tag: "9.4"
+      repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
+      tag: v17.2.1
   kubectl:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
@@ -67,5 +67,5 @@ shared-secrets:
 
 upgradeCheck:
   image:
-    repository: docker.io/redhat/ubi9
-    tag: "9.4"
+    repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
+    tag: v17.2.1
diff --git a/zarf.yaml b/zarf.yaml
index db4e0336..d2f989b0 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -58,7 +58,7 @@ components:
       - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:17.2.1"
       - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:17.2.1"
       - "registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.2.1"
-      - "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.4"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base:17.2.1"
       - "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.2.1"
 
   # Note: upstream flavor is experimental
@@ -85,5 +85,5 @@ components:
       - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.2.1"
       - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.2.1"
       - "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.2.1"
-      - "docker.io/redhat/ubi9:9.4"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.2.1"
       - "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.2.1"