(staging/local) helmfile: re-add redis deployments

k8s/helmfile/env/local/argocd-config.values.yaml.gotmpl

@@ -1,2 +1,2 @@
 environment: local
-appOfAppsVersion: 2.0.1
+appOfAppsVersion: 2.1.0

k8s/argocd/local/redis-2.values.yaml → k8s/helmfile/env/local/redis-2.values.yaml.gotmpl

@@ -2,11 +2,7 @@ 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
@@ -18,17 +14,12 @@ commonConfiguration: |
   # 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: ""
+  livenessProbe:
+    enabled: false
   readinessProbe:
     enabled: false
   resources:
@@ -39,26 +30,18 @@ master:
       cpu: 10m
       memory: 62Mi
 redisPort: 6379
+
 replica:
-  livenessProbe:
-    enabled: false
   persistence:
-    accessModes:
-      - ReadWriteOnce
-    enabled: true
-    path: /data
-    size: 1Gi
     storageClass: null
-    subPath: ""
+  livenessProbe:
+    enabled: false
   readinessProbe:
     enabled: false
-  replicaCount: 1
   resources:
     limits:
       cpu: 50m
       memory: 90Mi
     requests:
       cpu: 10m
       memory: 60Mi
-sentinel:
-  enabled: false

k8s/argocd/staging/redis-2.values.yaml → k8s/helmfile/env/production/redis-2.values.yaml.gotmpl

@@ -2,11 +2,14 @@ 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
@@ -18,6 +21,7 @@ commonConfiguration: |
   # Auto AOF file rewriting
   auto-aof-rewrite-percentage 100
   auto-aof-rewrite-min-size 85mb
+
 master:
   persistence:
     accessModes:
@@ -33,7 +37,9 @@ master:
     requests:
       cpu: 100m
       memory: 500Mi
+
 redisPort: 6379
+
 replica:
   persistence:
     accessModes:
@@ -50,5 +56,6 @@ replica:
     requests:
       cpu: 100m
       memory: 250Mi
+
 sentinel:
   enabled: false

k8s/helmfile/env/staging/argocd-config.values.yaml.gotmpl

@@ -1,2 +1,2 @@
 environment: staging
-appOfAppsVersion: 2.0.1
+appOfAppsVersion: 2.1.0

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: 500m
+      memory: 500Mi
+
+replica:
+  resources:
+    limits:
+      memory: 250Mi
+    requests:
+      cpu: 500m
+      memory: 250Mi

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
   ################################

k8s/helmfile/only-for-argo-value-generation.yaml

@@ -64,3 +64,9 @@ releases:
     chart: bitnami/redis
     version: 17.3.8
     <<: *default_release
+
+  - name: redis-2
+    namespace: default
+    chart: bitnami-legacy/redis
+    version: 19.6.4
+    <<: *default_release