From 73ec02f816f69de1cbb311cce36c62c31f741fdf Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 29 Sep 2025 16:20:11 +0200 Subject: [PATCH 1/5] re-add redis deplyments to helmfile --- .../local/argocd-config.values.yaml.gotmpl | 2 +- .../env/local/redis-2.values.yaml.gotmpl | 46 ++++++++++++++ .../env/production/redis-2.values.yaml.gotmpl | 61 +++++++++++++++++++ .../staging/argocd-config.values.yaml.gotmpl | 2 +- .../env/staging/redis-2.values.yaml.gotmpl | 20 ++++++ k8s/helmfile/helmfile.yaml | 14 ++++- .../only-for-argo-value-generation.yaml | 6 -- 7 files changed, 142 insertions(+), 9 deletions(-) create mode 100644 k8s/helmfile/env/local/redis-2.values.yaml.gotmpl create mode 100644 k8s/helmfile/env/production/redis-2.values.yaml.gotmpl create mode 100644 k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl diff --git a/k8s/helmfile/env/local/argocd-config.values.yaml.gotmpl b/k8s/helmfile/env/local/argocd-config.values.yaml.gotmpl index 3767b887a..bb6cb60f4 100644 --- a/k8s/helmfile/env/local/argocd-config.values.yaml.gotmpl +++ b/k8s/helmfile/env/local/argocd-config.values.yaml.gotmpl @@ -1,2 +1,2 @@ environment: local -appOfAppsVersion: 2.0.1 +appOfAppsVersion: 2.1.0 diff --git a/k8s/helmfile/env/local/redis-2.values.yaml.gotmpl b/k8s/helmfile/env/local/redis-2.values.yaml.gotmpl new file mode 100644 index 000000000..3ee797680 --- /dev/null +++ b/k8s/helmfile/env/local/redis-2.values.yaml.gotmpl @@ -0,0 +1,46 @@ +image: + registry: ghcr.io + repository: wbstack/redis + tag: 7.2.5-debian-12-r4 + +commonConfiguration: | + # Enable AOF https://redis.io/topics/persistence#append-only-file + appendonly yes + # Disable RDB persistence, AOF persistence already enabled. + save "" + # Control memory usage + maxmemory 50mb + maxmemory-policy volatile-lru + # Auto AOF file rewriting + auto-aof-rewrite-percentage 100 + auto-aof-rewrite-min-size 60mb + +master: + persistence: + storageClass: null + livenessProbe: + enabled: false + readinessProbe: + enabled: false + resources: + limits: + cpu: 50m + memory: 90Mi + requests: + cpu: 10m + memory: 62Mi + +replica: + persistence: + storageClass: null + livenessProbe: + enabled: false + readinessProbe: + enabled: false + resources: + limits: + cpu: 50m + memory: 90Mi + requests: + cpu: 10m + memory: 60Mi diff --git a/k8s/helmfile/env/production/redis-2.values.yaml.gotmpl b/k8s/helmfile/env/production/redis-2.values.yaml.gotmpl new file mode 100644 index 000000000..f2b155b8e --- /dev/null +++ b/k8s/helmfile/env/production/redis-2.values.yaml.gotmpl @@ -0,0 +1,61 @@ +image: + registry: ghcr.io + repository: wbstack/redis + tag: 7.2.5-debian-12-r4 + +architecture: replication + +auth: + enabled: true + existingSecret: redis-password + existingSecretPasswordKey: password + +commonConfiguration: | + # Enable AOF https://redis.io/topics/persistence#append-only-file + appendonly yes + # Disable RDB persistence, AOF persistence already enabled. + save "" + # Control memory usage + maxmemory 75mb + maxmemory-policy volatile-lru + # Auto AOF file rewriting + auto-aof-rewrite-percentage 100 + auto-aof-rewrite-min-size 85mb + +master: + persistence: + accessModes: + - ReadWriteOnce + enabled: true + path: /data + size: 1Gi + storageClass: premium-rwo + subPath: "" + resources: + limits: + memory: 500Mi + requests: + cpu: 30m + memory: 500Mi + +redisPort: 6379 + +replica: + persistence: + accessModes: + - ReadWriteOnce + enabled: true + path: /data + size: 1Gi + storageClass: premium-rwo + subPath: "" + replicaCount: 1 + resources: + limits: + memory: 250Mi + requests: + cpu: 60m + memory: 250Mi + +sentinel: + enabled: false diff --git a/k8s/helmfile/env/staging/argocd-config.values.yaml.gotmpl b/k8s/helmfile/env/staging/argocd-config.values.yaml.gotmpl index 381544e16..26e1589b5 100644 --- a/k8s/helmfile/env/staging/argocd-config.values.yaml.gotmpl +++ b/k8s/helmfile/env/staging/argocd-config.values.yaml.gotmpl @@ -1,2 +1,2 @@ environment: staging -appOfAppsVersion: 2.0.1 +appOfAppsVersion: 2.1.0 diff --git a/k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl b/k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl new file mode 100644 index 000000000..f32c9834b --- /dev/null +++ b/k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl @@ -0,0 +1,20 @@ +image: + registry: ghcr.io + repository: wbstack/redis + tag: 7.2.5-debian-12-r4 + +master: + resources: + limits: + memory: 500Mi + requests: + cpu: 100m + memory: 500Mi + +replica: + resources: + limits: + memory: 250Mi + requests: + cpu: 100m + memory: 250Mi diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml index cc2b341eb..aea4b7124 100644 --- a/k8s/helmfile/helmfile.yaml +++ b/k8s/helmfile/helmfile.yaml @@ -97,7 +97,7 @@ releases: - name: argocd-config namespace: argocd chart: wbstack/argocd-config - version: 2.0.1 + version: '{{ if eq .Environment.Name "production" }} 2.0.1 {{ else }} 2.1.0 {{ end }}' <<: *default_release - name: redirects @@ -225,6 +225,18 @@ releases: version: 0.1.0 <<: *default_release + - name: redis + installed: {{ ne .Environment.Name "production" | toYaml }} + namespace: default + chart: https://github.com/wbstack/bitnami-legacy/releases/download/redis/17.3.8/redis-17.3.8.tgz + <<: *default_release + + - name: redis-2 + installed: {{ ne .Environment.Name "production" | toYaml }} + namespace: default + chart: https://github.com/wbstack/bitnami-legacy/releases/download/redis/19.6.4/redis-19.6.4.tgz + <<: *default_release + ################################ # LOCAL ONLY ################################ diff --git a/k8s/helmfile/only-for-argo-value-generation.yaml b/k8s/helmfile/only-for-argo-value-generation.yaml index 5714cebfd..ad77b2854 100644 --- a/k8s/helmfile/only-for-argo-value-generation.yaml +++ b/k8s/helmfile/only-for-argo-value-generation.yaml @@ -58,9 +58,3 @@ releases: chart: wbstack/ui version: 0.3.1 <<: *default_release - - - name: redis - namespace: default - chart: bitnami/redis - version: 17.3.8 - <<: *default_release From 967750d73cc2c5f5712f046c31a4bf90438d7503 Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 29 Sep 2025 16:23:24 +0200 Subject: [PATCH 2/5] update value files --- k8s/argocd/local/redis-2.values.yaml | 64 ------------------- k8s/argocd/local/redis.values.yaml | 64 ------------------- k8s/argocd/staging/redis-2.values.yaml | 54 ---------------- k8s/argocd/staging/redis.values.yaml | 54 ---------------- .../only-for-argo-value-generation.yaml | 12 ++++ 5 files changed, 12 insertions(+), 236 deletions(-) delete mode 100644 k8s/argocd/local/redis-2.values.yaml delete mode 100644 k8s/argocd/local/redis.values.yaml delete mode 100644 k8s/argocd/staging/redis-2.values.yaml delete mode 100644 k8s/argocd/staging/redis.values.yaml diff --git a/k8s/argocd/local/redis-2.values.yaml b/k8s/argocd/local/redis-2.values.yaml deleted file mode 100644 index 80e93f1dc..000000000 --- a/k8s/argocd/local/redis-2.values.yaml +++ /dev/null @@ -1,64 +0,0 @@ -image: - registry: ghcr.io - repository: wbstack/redis - tag: 7.2.5-debian-12-r4 -architecture: replication -auth: - enabled: true - existingSecret: redis-password - existingSecretPasswordKey: password -commonConfiguration: | - # Enable AOF https://redis.io/topics/persistence#append-only-file - appendonly yes - # Disable RDB persistence, AOF persistence already enabled. - save "" - # Control memory usage - maxmemory 50mb - maxmemory-policy volatile-lru - # Auto AOF file rewriting - auto-aof-rewrite-percentage 100 - auto-aof-rewrite-min-size 60mb -master: - livenessProbe: - enabled: false - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: null - subPath: "" - readinessProbe: - enabled: false - resources: - limits: - cpu: 50m - memory: 90Mi - requests: - cpu: 10m - memory: 62Mi -redisPort: 6379 -replica: - livenessProbe: - enabled: false - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: null - subPath: "" - readinessProbe: - enabled: false - replicaCount: 1 - resources: - limits: - cpu: 50m - memory: 90Mi - requests: - cpu: 10m - memory: 60Mi -sentinel: - enabled: false diff --git a/k8s/argocd/local/redis.values.yaml b/k8s/argocd/local/redis.values.yaml deleted file mode 100644 index 3e526056c..000000000 --- a/k8s/argocd/local/redis.values.yaml +++ /dev/null @@ -1,64 +0,0 @@ -architecture: replication -auth: - enabled: true - existingSecret: redis-password - existingSecretPasswordKey: password -commonConfiguration: | - # Enable AOF https://redis.io/topics/persistence#append-only-file - appendonly yes - # Disable RDB persistence, AOF persistence already enabled. - save "" - # Control memory usage - maxmemory 50mb - maxmemory-policy volatile-lru - # Auto AOF file rewriting - auto-aof-rewrite-percentage 100 - auto-aof-rewrite-min-size 60mb -image: - registry: ghcr.io - repository: wbstack/redis - tag: 7.0.5-debian-11-r15 -master: - livenessProbe: - enabled: false - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: null - subPath: "" - readinessProbe: - enabled: false - resources: - limits: - cpu: 50m - memory: 90Mi - requests: - cpu: 10m - memory: 62Mi -redisPort: 6379 -replica: - livenessProbe: - enabled: false - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: null - subPath: "" - readinessProbe: - enabled: false - replicaCount: 1 - resources: - limits: - cpu: 50m - memory: 90Mi - requests: - cpu: 10m - memory: 60Mi -sentinel: - enabled: false diff --git a/k8s/argocd/staging/redis-2.values.yaml b/k8s/argocd/staging/redis-2.values.yaml deleted file mode 100644 index ec11cbb23..000000000 --- a/k8s/argocd/staging/redis-2.values.yaml +++ /dev/null @@ -1,54 +0,0 @@ -image: - registry: ghcr.io - repository: wbstack/redis - tag: 7.2.5-debian-12-r4 -architecture: replication -auth: - enabled: true - existingSecret: redis-password - existingSecretPasswordKey: password -commonConfiguration: | - # Enable AOF https://redis.io/topics/persistence#append-only-file - appendonly yes - # Disable RDB persistence, AOF persistence already enabled. - save "" - # Control memory usage - maxmemory 75mb - maxmemory-policy volatile-lru - # Auto AOF file rewriting - auto-aof-rewrite-percentage 100 - auto-aof-rewrite-min-size 85mb -master: - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: premium-rwo - subPath: "" - resources: - limits: - memory: 500Mi - requests: - cpu: 100m - memory: 500Mi -redisPort: 6379 -replica: - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: premium-rwo - subPath: "" - replicaCount: 1 - resources: - limits: - memory: 250Mi - requests: - cpu: 100m - memory: 250Mi -sentinel: - enabled: false diff --git a/k8s/argocd/staging/redis.values.yaml b/k8s/argocd/staging/redis.values.yaml deleted file mode 100644 index 2c7214a92..000000000 --- a/k8s/argocd/staging/redis.values.yaml +++ /dev/null @@ -1,54 +0,0 @@ -architecture: replication -auth: - enabled: true - existingSecret: redis-password - existingSecretPasswordKey: password -commonConfiguration: | - # Enable AOF https://redis.io/topics/persistence#append-only-file - appendonly yes - # Disable RDB persistence, AOF persistence already enabled. - save "" - # Control memory usage - maxmemory 75mb - maxmemory-policy volatile-lru - # Auto AOF file rewriting - auto-aof-rewrite-percentage 100 - auto-aof-rewrite-min-size 85mb -image: - registry: ghcr.io - repository: wbstack/redis - tag: 7.0.5-debian-11-r15 -master: - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: premium-rwo - subPath: "" - resources: - limits: - memory: 500Mi - requests: - cpu: 100m - memory: 500Mi -redisPort: 6379 -replica: - persistence: - accessModes: - - ReadWriteOnce - enabled: true - path: /data - size: 1Gi - storageClass: premium-rwo - subPath: "" - replicaCount: 1 - resources: - limits: - memory: 250Mi - requests: - cpu: 100m - memory: 250Mi -sentinel: - enabled: false diff --git a/k8s/helmfile/only-for-argo-value-generation.yaml b/k8s/helmfile/only-for-argo-value-generation.yaml index ad77b2854..0a09d1177 100644 --- a/k8s/helmfile/only-for-argo-value-generation.yaml +++ b/k8s/helmfile/only-for-argo-value-generation.yaml @@ -58,3 +58,15 @@ releases: chart: wbstack/ui version: 0.3.1 <<: *default_release + + - name: redis + namespace: default + chart: bitnami/redis + version: 17.3.8 + <<: *default_release + + - name: redis-2 + namespace: default + chart: bitnami-legacy/redis + version: 19.6.4 + <<: *default_release From 9cef487a122f19c8d03bd3f16c9f686ef9965c96 Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Tue, 30 Sep 2025 12:07:24 +0200 Subject: [PATCH 3/5] undo cpu requests changes unclear where they came from --- k8s/helmfile/env/production/redis-2.values.yaml.gotmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/helmfile/env/production/redis-2.values.yaml.gotmpl b/k8s/helmfile/env/production/redis-2.values.yaml.gotmpl index f2b155b8e..3e68b6c09 100644 --- a/k8s/helmfile/env/production/redis-2.values.yaml.gotmpl +++ b/k8s/helmfile/env/production/redis-2.values.yaml.gotmpl @@ -35,7 +35,7 @@ master: limits: memory: 500Mi requests: - cpu: 30m + cpu: 100m memory: 500Mi redisPort: 6379 @@ -54,7 +54,7 @@ replica: limits: memory: 250Mi requests: - cpu: 60m + cpu: 100m memory: 250Mi sentinel: From b0007ca22092610c3c796612e06085643d7d039e Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Tue, 30 Sep 2025 12:09:28 +0200 Subject: [PATCH 4/5] local: re-add redis port --- k8s/helmfile/env/local/redis-2.values.yaml.gotmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/k8s/helmfile/env/local/redis-2.values.yaml.gotmpl b/k8s/helmfile/env/local/redis-2.values.yaml.gotmpl index 3ee797680..bc9df8f0f 100644 --- a/k8s/helmfile/env/local/redis-2.values.yaml.gotmpl +++ b/k8s/helmfile/env/local/redis-2.values.yaml.gotmpl @@ -29,6 +29,7 @@ master: requests: cpu: 10m memory: 62Mi +redisPort: 6379 replica: persistence: From 6405b5ed23320143b3af8012088a43edfe9ae055 Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Tue, 30 Sep 2025 14:27:26 +0200 Subject: [PATCH 5/5] Update redis-2.values.yaml.gotmpl --- k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl b/k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl index f32c9834b..2733ffd05 100644 --- a/k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl +++ b/k8s/helmfile/env/staging/redis-2.values.yaml.gotmpl @@ -8,7 +8,7 @@ master: limits: memory: 500Mi requests: - cpu: 100m + cpu: 500m memory: 500Mi replica: @@ -16,5 +16,5 @@ replica: limits: memory: 250Mi requests: - cpu: 100m + cpu: 500m memory: 250Mi