Refactor FleetDM Stack Helm chart: remove MySQL and Redis dependencies, update values.yaml to use built-in Fleet subcharts, add logo image, and adjust Helm install timeout in Makefile.

fleetdm-stack/values.yaml

@@ -1,77 +1,53 @@
-# FleetDM Stack - Values for FleetDM Server, MySQL, and Redis
+# FleetDM Stack - Values for FleetDM Server, MySQL and Redis
+# Uses Fleet chart's built-in mysql/redis (ensures migration runs after DB is ready)
 # Deploy with: helm install fleetdm-stack . -n fleetdm -f values.yaml
 
 global:
   namespace: fleetdm
 
-# MySQL configuration
-mysql:
-  enabled: true
-  auth:
-    username: fleet
-    database: fleet
-    # Override for production: --set mysql.auth.password=YOUR_SECURE_PASSWORD
-    password: "fleetdm-local-dev"
-  # Optional: use bitnamilegacy/mysql if you hit image pull limits
-  # image:
-  #   repository: bitnamilegacy/mysql
-  #   tag: "8.0.35-debian-12-r2"
-  primary:
-    persistence:
-      enabled: true
-      size: 8Gi
-
-# Redis configuration
-redis:
-  enabled: true
-  architecture: standalone
-  auth:
-    enabled: false
-  master:
-    persistence:
-      enabled: true
-      size: 1Gi
-  # Optional: use bitnamilegacy/redis if you hit image pull limits
-  # image:
-  #   repository: bitnamilegacy/redis
-  #   tag: "7.2.4-debian-12-r12"
-  commonConfiguration: |
-    maxmemory 256mb
-    maxmemory-policy allkeys-lru
-
-# FleetDM configuration
+# Fleet chart (includes mysql + redis as its subcharts)
 fleet:
+  # MySQL (Fleet's subchart)
+  mysql:
+    enabled: true
+    image:
+      registry: docker.io
+      repository: bitnamilegacy/mysql
+      tag: 8.0.35-debian-12-r2
+    auth:
+      username: fleet
+      database: fleet
+      password: "fleetdm-local-dev"
+    primary:
+      persistence:
+        enabled: true
+        size: 8Gi
+  # Redis (Fleet's subchart)
+  redis:
+    enabled: true
+    image:
+      registry: docker.io
+      repository: bitnamilegacy/redis
+      tag: 7.2.4-debian-12-r12
+    architecture: standalone
+    auth:
+      enabled: false
+    master:
+      persistence:
+        enabled: true
+        size: 1Gi
+    commonConfiguration: |
+      maxmemory 256mb
+      maxmemory-policy allkeys-lru
   enabled: true
   hostName: fleet.localhost
   replicas: 1
   imageRepository: fleetdm/fleet
   imageTag: v4.80.1
-  # Run fleet prepare db on fresh install (autoApplySQLMigrations)
   fleet:
     autoApplySQLMigrations: true
-  mysql:
-    enabled: false
-  redis:
-    enabled: false
-  # Disable TLS for local dev (ingress can terminate TLS if needed)
   tls:
     enabled: false
-  # Connect to our MySQL and Redis subcharts
-  database:
-    secretName: fleetdm-stack-mysql
-    address: fleetdm-stack-mysql:3306
-    database: fleet
-    username: fleet
-    passwordKey: mysql-password
-    maxOpenConns: 50
-    maxIdleConns: 50
-  cache:
-    address: fleetdm-stack-redis-master:6379
-    database: "0"
-    usePassword: false
-    secretName: ""
-    passwordKey: ""
-  # Expose Fleet UI and agent endpoints (reachable by agents)
   ingress:
     enabled: true
     className: nginx
@@ -83,7 +59,6 @@ fleet:
           - path: /
             pathType: ImplementationSpecific
     tls: []
-  # Reduce resources for local dev
   resources:
     limits:
       cpu: 500m