chore: move k3d specifics into a separate chart

charts/ftl-k3d/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: ftl
+  repository: file://../ftl
+  version: 0.0.1
+digest: sha256:c1db1cd9b05146c2404cae0a8cabe17ceb8f91a852948fe8f7a0312ea24d82dd
+generated: "2025-03-07T12:05:56.43938+11:00"

charts/ftl-k3d/Chart.yaml

@@ -0,0 +1,11 @@
+apiVersion: v2
+name: ftl-k3d
+description: |
+  A Helm chart for Kubernetes that deploys supplimental dependencies for k3d
+home: https://github.com/block/ftl
+version: 0.0.1
+appVersion: 0.0.1
+dependencies:
+  - name: ftl
+    version: 0.0.1
+    repository: file://../ftl

charts/ftl/templates/ingress.yaml → charts/ftl-k3d/templates/ingress.yaml

@@ -1,11 +1,10 @@
-{{- if .Values.ingress.enabled }}
-{{ $fullName := include "ftl.fullname" . -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "ftl.fullname" . }}-ingress
+  name: ftl-ingress
   annotations:
-    {{- toYaml .Values.ingress.ingressAnnotations | nindent 4 }}
+    ingress.kubernetes.io/ssl-redirect: "false"
+    kubernetes.io/ingress.class: traefik
 spec:
   rules:
   - http:
@@ -38,21 +37,3 @@ spec:
               name: ftl-admin
               port:
                 number: 8892
-  {{- range $host := .Values.ingress.hosts }}
-  - host: "{{ $host.host }}"
-    http:
-      paths:
-      {{- range $host.paths }}
-      - path: {{ .path }}
-        pathType: {{ .pathType }}
-        backend:
-          service:
-            name: {{ $host.service.name }}
-            port:
-              number: {{ $host.service.port }}
-      {{- end }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls: {{- toYaml .Values.ingress.tls | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/ftl/templates/istio.yaml → charts/ftl-k3d/templates/istio.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.istio.enabled }}
 apiVersion: networking.istio.io/v1alpha3
 kind: EnvoyFilter
 metadata:
@@ -34,4 +33,3 @@ spec:
         operation: MERGE
         value:
           http2_protocol_options: {}
-{{- end }}

charts/ftl/templates/registry.yaml → charts/ftl-k3d/templates/registry.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.registry.create }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -24,12 +23,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "ftl.fullname" . }}-registry
-
-  {{- if .Values.registry.service.annotations }}
-  annotations:
-    {{- toYaml .Values.registry.service.annotations | nindent 4 }}
-  {{- end }}
+  name: ftl-registry
 spec:
   ports:
     - name: http
@@ -38,5 +32,4 @@ spec:
       targetPort: 5000
   selector:
     app: registry
-  type:  "ClusterIP"
-{{- end }}
+  type:  "ClusterIP"

charts/ftl-k3d/values.yaml

@@ -0,0 +1,5 @@
+
+ftl:
+  registry:
+    repository: "ftl-registry:5000/ftl-artefacts"
+    allowInsecure: "true"

charts/ftl/Chart.yaml

@@ -4,9 +4,4 @@ description: |
   A Helm chart for Kubernetes that deploys FTL
 home: https://github.com/block/ftl
 version: 0.0.1
-appVersion: 0.0.1
-dependencies:
-  - name: postgresql
-    version: 15.5.38
-    repository: oci://registry-1.docker.io/bitnamicharts
-    condition: postgresql.enabled
+appVersion: 0.0.1

charts/ftl/templates/secrets.yaml

@@ -6,9 +6,9 @@ metadata:
     {{- include "ftl.labels" . | nindent 4 }}
 type: Opaque
 stringData:
-  FTL_LOG_ENCRYPTION_KEY: {{ .Values.secrets.logEncryptionKey }}
-  FTL_ASYNC_ENCRYPTION_KEY: {{ .Values.secrets.asyncEncryptionKey }}
-  FTL_CONTROLLER_REGISTRY_USERNAME: {{ .Values.secrets.controllerRegistryUsername }}
-  FTL_CONTROLLER_REGISTRY_PASSWORD: {{ .Values.secrets.controllerRegistryPassword }}
-  FTL_RUNNER_REGISTRY_USERNAME: {{ .Values.secrets.runnerRegistryUsername }}
-  FTL_RUNNER_REGISTRY_PASSWORD: {{ .Values.secrets.runnerRegistryPassword }}
+  FTL_LOG_ENCRYPTION_KEY: "{{ .Values.secrets.logEncryptionKey }}"
+  FTL_ASYNC_ENCRYPTION_KEY: "{{ .Values.secrets.asyncEncryptionKey }}"
+  FTL_CONTROLLER_REGISTRY_USERNAME: "{{ .Values.secrets.controllerRegistryUsername }}"
+  FTL_CONTROLLER_REGISTRY_PASSWORD: "{{ .Values.secrets.controllerRegistryPassword }}"
+  FTL_RUNNER_REGISTRY_USERNAME: "{{ .Values.secrets.runnerRegistryUsername }}"
+  FTL_RUNNER_REGISTRY_PASSWORD: "{{ .Values.secrets.runnerRegistryPassword }}"

charts/ftl/values.yaml

@@ -1,4 +1,4 @@
-fullnameOverride: ""
+fullnameOverride: "ftl"
 nameOverride: ""
 
 logLevel: debug
@@ -172,22 +172,6 @@ cron:
       memory: 128Mi
       cpu: 2
 
-postgresql:
-  enabled: false
-  architecture: standalone
-  primary:
-    resources:
-      requests:
-        memory: 1024Mi
-      limits:
-        memory: 1024Mi
-  global:
-    postgresql:
-      auth:
-        username: ftl
-        password: ftl
-        database: ftl
-
 istio:
   enabled: false # set to true to have this chart install the grpc config to enable trailers
   holdApplicationUntilProxyStarts: true
@@ -200,7 +184,6 @@ registry:
     annotations: null
 
 ingress:
-  enabled: false
   allowOrigin: "*"
   env: null
 

deployment/Justfile

@@ -102,7 +102,8 @@ teardown: teardown-cluster teardown-registry
 # Apply Helm chart for FTL deployment
 apply:
   kubectl delete job --ignore-not-found=true ftl-dbmig-latest
-  helm upgrade --install ftl ../charts/ftl -f values.yaml
+  helm dependency build ../charts/ftl-k3d
+  helm upgrade --install ftl-k3d ../charts/ftl-k3d -f values.yaml
 
 # Deploy specific version of FTL from Helm repository
 deploy-version version: setup-istio-cluster

deployment/values.yaml

@@ -1,25 +1,12 @@
-fullnameOverride: "ftl"
 
-image:
-  tag: "latest"
-  pullPolicy: Always
-  base: "ftl:5000"
+ftl:
+  runner:
+    podAnnotations:
+      sidecar.istio.io/logLevel: "debug"
+  image:
+    tag: "latest"
+    pullPolicy: Always
+    base: "ftl:5000"
 
-ingress:
-  enabled: true
-  ingressAnnotations:
-    ingress.kubernetes.io/ssl-redirect: "false"
-    kubernetes.io/ingress.class: traefik
 
-runner:
-  podAnnotations:
-    sidecar.istio.io/logLevel: "debug"
-
-istio:
-  enabled: true
-
-registry:
-    repository: "ftl-registry:5000/ftl-artefacts"
-    allowInsecure: "true"
-    create: true