From c098a5b10b9a0c3a11cc3600f9d449b12af99bfa Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Wed, 15 Jan 2025 02:33:51 -0600
Subject: [PATCH] add valkey

---
 clusters/cl01tl/services/harbor/Chart.yaml    |  7 ++++++
 .../harbor/templates/external-secret.yaml     | 25 +++++++++++++++++++
 clusters/cl01tl/services/harbor/values.yaml   | 23 ++++++++++-------
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/clusters/cl01tl/services/harbor/Chart.yaml b/clusters/cl01tl/services/harbor/Chart.yaml
index 1e46d0ae0..ccee0a10b 100644
--- a/clusters/cl01tl/services/harbor/Chart.yaml
+++ b/clusters/cl01tl/services/harbor/Chart.yaml
@@ -11,12 +11,19 @@ home: https://wiki.alexlebens.dev/doc/harbor-
 sources:
   - https://github.com/goharborv
   - https://github.com/goharbor/harbor-helm
+  - https://github.com/valkey-io/valkey
+  - https://github.com/cloudnative-pg/cloudnative-pg
+  - https://github.com/bitnami/charts/tree/main/bitnami/valkey
+  - https://github.com/alexlebens/helm-charts/charts/postgres-cluster
 maintainers:
   - name: alexlebens
 dependencies:
   - name: harbor
     version: v1.16.1
     repository: https://helm.goharbor.io
+  - name: valkey
+    version: 2.2.1
+    repository: https://charts.bitnami.com/bitnami
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 4.1.3
diff --git a/clusters/cl01tl/services/harbor/templates/external-secret.yaml b/clusters/cl01tl/services/harbor/templates/external-secret.yaml
index 32024082b..b81f5aa5e 100644
--- a/clusters/cl01tl/services/harbor/templates/external-secret.yaml
+++ b/clusters/cl01tl/services/harbor/templates/external-secret.yaml
@@ -64,6 +64,31 @@ spec:
         metadataPolicy: None
         property: registry-ht-password
 
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: valkey-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: valkey-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: REDIS_PASSWORD
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/harbor/config
+        metadataPolicy: None
+        property: valkey-password
+
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
diff --git a/clusters/cl01tl/services/harbor/values.yaml b/clusters/cl01tl/services/harbor/values.yaml
index 92e7fb985..112a32e39 100644
--- a/clusters/cl01tl/services/harbor/values.yaml
+++ b/clusters/cl01tl/services/harbor/values.yaml
@@ -23,10 +23,6 @@ harbor:
           storageClass: ceph-block-delete
           accessMode: ReadWriteOnce
           size: 5Gi
-      redis:
-        storageClass: ceph-block-delete
-        accessMode: ReadWriteOnce
-        size: 5Gi
       trivy:
         storageClass: ceph-block-delete
         accessMode: ReadWriteOnce
@@ -110,15 +106,24 @@ harbor:
       coreDatabase: app
       existingSecret: harbor-postgresql-17-cluster-app
   redis:
-    type: internal
-    internal:
-      image:
-        repository: ghcr.io/goharbor/redis-photon
-        tag: v2.12.1
+    type: external
+    external:
+      addr: "harbor-valkey-headless:6379"
+      coreDatabaseIndex: "0"
+      jobserviceDatabaseIndex: "1"
+      registryDatabaseIndex: "2"
+      trivyAdapterIndex: "5"
+      existingSecret: valkey-secret
   exporter:
     image:
       repository: ghcr.io/goharbor/harbor-exporter
       tag: v2.12.1
+valkey:
+  architecture: standalone
+  auth:
+    enabled: true
+    existingSecret: valkey-secret
+    existingSecretPasswordKey: REDIS_PASSWORD
 postgres-17-cluster:
   mode: standalone
   cluster: