From 07282ae7ba157420aa091a32a46b8277baf0739e Mon Sep 17 00:00:00 2001
From: Joseph Richardson <49208786+JoeHCQ1@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:57:54 -0400
Subject: [PATCH] feat: swapped redis for valkey and updated gitlab uds pkg
 version to v17.1.1-uds1 (#146)

---
 bundles/uds-core-swf/uds-bundle.yaml    | 36 ++++++++++++++++++-------
 packages/gitlab-redis/redis-secret.yaml |  8 ------
 packages/gitlab-redis/zarf.yaml         | 25 -----------------
 tasks.yaml                              |  1 -
 tasks/create.yaml                       |  5 ----
 5 files changed, 26 insertions(+), 49 deletions(-)
 delete mode 100644 packages/gitlab-redis/redis-secret.yaml
 delete mode 100644 packages/gitlab-redis/zarf.yaml

diff --git a/bundles/uds-core-swf/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml
index cefdff23..87b034d5 100644
--- a/bundles/uds-core-swf/uds-bundle.yaml
+++ b/bundles/uds-core-swf/uds-bundle.yaml
@@ -397,13 +397,27 @@ packages:
     ref: 0.0.2
 
   # Gitlab
-  - name: gitlab-redis
-    repository: ghcr.io/defenseunicorns/packages/uds/dev-redis
-    ref: 0.0.2
-
-  - name: gitlab-redis-secret
-    path: ../../build
-    ref: 0.0.1
+  - name: gitlab-valkey
+    repository: ghcr.io/defenseunicorns/packages/uds/valkey
+    ref: 7.2.5-uds.1-upstream
+    overrides:
+      valkey:
+        uds-valkey-config:
+          values:
+            - path: custom
+              value:
+                - direction: Ingress
+                  selector:
+                    app.kubernetes.io/name: valkey
+                  remoteNamespace: gitlab
+                  port: 6379
+                  description: "Ingress from GitLab"
+            - path: copyPassword
+              value:
+                enabled: true
+                namespace: gitlab
+                secretName: gitlab-redis
+                secretKey: password
 
   - name: gitlab-object-store
     path: ../../build
@@ -415,7 +429,7 @@ packages:
 
   - name: gitlab
     repository: ghcr.io/defenseunicorns/packages/uds/gitlab
-    ref: 17.0.2-uds.0-registry1
+    ref: 17.1.1-uds.1-registry1
     overrides:
       gitlab:
         uds-gitlab-config:
@@ -428,8 +442,8 @@ packages:
               value:
                 internal: true
                 selector:
-                  app.kubernetes.io/instance: redis
-                namespace: dev-redis
+                  app.kubernetes.io/name: valkey
+                namespace: valkey
                 port: 6379
         gitlab:
           values:
@@ -456,6 +470,8 @@ packages:
               value: *gitlab-init-security-context
             - path: gitlab.gitaly.init.containerSecurityContext
               value: *gitlab-init-security-context
+            - path: global.redis.host
+              value: "valkey-master.valkey.svc.cluster.local"
 
           variables:
             - name: MIGRATIONS_RESOURCES
diff --git a/packages/gitlab-redis/redis-secret.yaml b/packages/gitlab-redis/redis-secret.yaml
deleted file mode 100644
index 551c4aaf..00000000
--- a/packages/gitlab-redis/redis-secret.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: gitlab-redis
-  namespace: gitlab
-type: kubernetes.io/opaque
-stringData:
-  password: "###ZARF_VAR_REDIS_PASSWORD###"
diff --git a/packages/gitlab-redis/zarf.yaml b/packages/gitlab-redis/zarf.yaml
deleted file mode 100644
index 18941d02..00000000
--- a/packages/gitlab-redis/zarf.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/main/zarf.schema.json
-kind: ZarfPackageConfig
-metadata:
-  name: gitlab-redis-secret
-  version: "0.0.1"
-  architecture: amd64
-
-components:
-  - name: redis-password
-    required: true
-    actions:
-      onDeploy:
-        before:
-          - cmd: ./zarf tools kubectl get secret -n dev-redis redis --template='{{ index .data "redis-password" }}' | base64 -d
-            mute: true
-            setVariables:
-              - name: REDIS_PASSWORD
-                sensitive: true
-  - name: gitlab-redis
-    required: true
-    manifests:
-      - name: gitlab-redis
-        namespace: gitlab
-        files:
-          - redis-secret.yaml
diff --git a/tasks.yaml b/tasks.yaml
index 8bc096e8..78603a9e 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -10,7 +10,6 @@ tasks:
     actions:
       - task: create:build-dir
       - task: create:database-manifest-packages
-      - task: create:gitlab-redis-secret-package
       - task: create:keycloak-config-wrapper-package
       - task: create:namespaces-package
       - task: create:object-store-packages
diff --git a/tasks/create.yaml b/tasks/create.yaml
index 2ebfb4ff..9bf8bafc 100644
--- a/tasks/create.yaml
+++ b/tasks/create.yaml
@@ -26,11 +26,6 @@ tasks:
       - cmd: ./uds zarf package create ./packages/databases/jira/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
 
-  - name: gitlab-redis-secret-package
-    description: Create package for the gitlab redis secret
-    actions:
-      - cmd: ./uds zarf package create ./packages/gitlab-redis --confirm --no-progress --architecture=${ARCH} --skip-sbom --output ./build
-
   - name: keycloak-config-wrapper-package
     description: Create the keycloak configurations shim loader
     actions: