diff --git a/.gitignore b/.gitignore index 34fa391..57ee6b1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ fleetdm-stack/charts/*.tgz # Local .helm/ *.log -djinni-007-devops-engineer-flamingo +/*-flamingo diff --git a/Makefile b/Makefile index 6a26ec3..55f16a3 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ install: deps @echo "Installing FleetDM stack..." helm upgrade --install $(RELEASE_NAME) fleetdm-stack/ \ --namespace $(NAMESPACE) \ - --wait + --wait --timeout 15m @echo "Installation complete. Run 'make verify' to check status." uninstall: diff --git a/assets/logo.png b/assets/logo.png new file mode 100644 index 0000000..2e7c64f Binary files /dev/null and b/assets/logo.png differ diff --git a/fleetdm-stack/Chart.lock b/fleetdm-stack/Chart.lock index c31ba99..be504e8 100644 --- a/fleetdm-stack/Chart.lock +++ b/fleetdm-stack/Chart.lock @@ -1,12 +1,6 @@ dependencies: -- name: mysql - repository: oci://registry-1.docker.io/bitnamicharts - version: 9.12.5 -- name: redis - repository: oci://registry-1.docker.io/bitnamicharts - version: 18.1.6 - name: fleet repository: https://fleetdm.github.io/fleet/charts version: v6.8.0 -digest: sha256:5bcb4888ac713f0aa05e2aee6794db449f26eaa65a6eced2fd7ff48cf7337a52 -generated: "2026-02-19T15:56:34.555441882Z" +digest: sha256:ab8c11dfc9bb9f35ca7d2dc9cc8d29afc8b031119c5bc68a9ce8ad3885f1914a +generated: "2026-02-19T16:05:03.470525533Z" diff --git a/fleetdm-stack/Chart.yaml b/fleetdm-stack/Chart.yaml index 90101cb..8076f01 100644 --- a/fleetdm-stack/Chart.yaml +++ b/fleetdm-stack/Chart.yaml @@ -12,14 +12,7 @@ maintainers: - name: Flamingo Applicant email: eslider@gmail.com dependencies: - - name: mysql - version: "9.12.5" - repository: oci://registry-1.docker.io/bitnamicharts - condition: mysql.enabled - - name: redis - version: "18.1.6" - repository: oci://registry-1.docker.io/bitnamicharts - condition: redis.enabled + # Use Fleet's built-in mysql/redis so migration hook runs after they exist - name: fleet version: ">=6.7.0" repository: https://fleetdm.github.io/fleet/charts diff --git a/fleetdm-stack/charts/mysql-9.12.5.tgz b/fleetdm-stack/charts/mysql-9.12.5.tgz deleted file mode 100644 index 0aa4a2f..0000000 Binary files a/fleetdm-stack/charts/mysql-9.12.5.tgz and /dev/null differ diff --git a/fleetdm-stack/charts/redis-18.1.6.tgz b/fleetdm-stack/charts/redis-18.1.6.tgz deleted file mode 100644 index 5927181..0000000 Binary files a/fleetdm-stack/charts/redis-18.1.6.tgz and /dev/null differ diff --git a/fleetdm-stack/values.yaml b/fleetdm-stack/values.yaml index c88b183..35ffbcf 100644 --- a/fleetdm-stack/values.yaml +++ b/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