From 8f685ea6d102131c77ee93b4e554e0fbe64a4f2d Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Fri, 16 May 2025 23:22:57 -0500 Subject: [PATCH] add valkey --- clusters/cl01tl/services/harbor/Chart.yaml | 5 ++ clusters/cl01tl/services/harbor/values.yaml | 57 ++++++++++++--------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/clusters/cl01tl/services/harbor/Chart.yaml b/clusters/cl01tl/services/harbor/Chart.yaml index 9b9b132b5..06daf07bc 100644 --- a/clusters/cl01tl/services/harbor/Chart.yaml +++ b/clusters/cl01tl/services/harbor/Chart.yaml @@ -10,8 +10,10 @@ keywords: home: https://wiki.alexlebens.dev/s/7e132c13-afee-48ec-b3dd-efd656d240c9 sources: - https://github.com/goharbor + - https://github.com/valkey-io/valkey - https://github.com/cloudnative-pg/cloudnative-pg - https://github.com/goharbor/harbor-helm + - https://github.com/bitnami/charts/tree/main/bitnami/valkey - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster maintainers: - name: alexlebens @@ -19,6 +21,9 @@ dependencies: - name: harbor version: 1.17.0 repository: https://helm.goharbor.io + - name: valkey + version: 3.0.6 + repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts - name: postgres-cluster alias: postgres-17-cluster version: 5.1.0 diff --git a/clusters/cl01tl/services/harbor/values.yaml b/clusters/cl01tl/services/harbor/values.yaml index 2fc5b8a50..1f57bcb63 100644 --- a/clusters/cl01tl/services/harbor/values.yaml +++ b/clusters/cl01tl/services/harbor/values.yaml @@ -12,19 +12,6 @@ harbor: storageClass: ceph-block accessMode: ReadWriteOnce size: 80Gi - jobservice: - jobLog: - storageClass: ceph-block - accessMode: ReadWriteOnce - size: 5Gi - redis: - storageClass: ceph-block - accessMode: ReadWriteOnce - size: 5Gi - trivy: - storageClass: ceph-block - accessMode: ReadWriteOnce - size: 5Gi existingSecretAdminPassword: harbor-secret existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD ipFamily: @@ -35,35 +22,46 @@ harbor: updateStrategy: type: Recreate existingSecretSecretKey: harbor-secret + enableMigrateHelmHook: true metrics: enabled: true serviceMonitor: enabled: true cache: - enabled: true + enabled: false + nginx: + image: + repository: goharbor/nginx-photon + tag: v2.13.0 + replicas: 0 portal: image: - repository: ghcr.io/goharbor/harbor-portal + repository: goharbor/harbor-portal tag: v2.13.0 + replicas: 2 core: image: - repository: ghcr.io/goharbor/harbor-core + repository: goharbor/harbor-core tag: v2.13.0 + replicas: 2 # existingSecret: harbor-secret jobservice: image: - repository: ghcr.io/goharbor/harbor-jobservice + repository: goharbor/harbor-jobservice tag: v2.13.0 + replicas: 2 + jobLoggers: + - stdout # existingSecret: harbor-secret # existingSecretKey: JOBSERVICE_SECRET registry: registry: image: - repository: ghcr.io/goharbor/registry-photon + repository: goharbor/registry-photon tag: v2.13.0 controller: image: - repository: ghcr.io/goharbor/harbor-registryctl + repository: goharbor/harbor-registryctl tag: v2.13.0 # existingSecret: harbor-secret # existingSecretKey: REGISTRY_HTTP_SECRET @@ -86,15 +84,26 @@ harbor: coreDatabase: app existingSecret: harbor-postgresql-17-cluster-app redis: - type: internal - internal: - image: - repository: goharbor/redis-photon - tag: v2.13.0 + type: external + external: + addr: "harbor-valkey-headless.harbor:6379" exporter: image: repository: ghcr.io/goharbor/harbor-exporter tag: v2.13.0 +valkey: + architecture: replication + auth: + enabled: false + usePasswordFiles: false + primary: + persistence: + enabled: true + size: 5Gi + replica: + persistence: + enabled: true + size: 5Gi postgres-17-cluster: mode: standalone cluster: