fix: chart fixes (#3084)

charts/Chart.yaml

@@ -4,6 +4,7 @@ description: |
   A Helm chart for Kubernetes that deploys FTL
 home: https://github.com/TBD54566975/ftl
 version: 0.0.1
+appVersion: 0.0.1
 dependencies:
   - name: postgresql
     version: 15.5.29

charts/Justfile

@@ -6,7 +6,7 @@ dep-update:
 
 set-version version:
     @echo "Setting version to {{version}}"
-    yq -i  '.version="{{version}}"' Chart.yaml
+    yq -i  '.version="{{version}}",.appVersion="{{version}}"' Chart.yaml
 
 package:
     helm lint .

charts/templates/controller.yaml

@@ -1,3 +1,4 @@
+{{ $version := printf "v%s" .Chart.Version -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -22,7 +23,7 @@ spec:
       serviceAccountName: {{ include "ftl.fullname" . }}-controller
       containers:
         - name: app
-          image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default .Chart.Version }}"
+          image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default $version }}"
           {{- if .Values.controller.envFrom }}
           envFrom:
             {{- if .Values.controller.envFrom }}

charts/templates/db-migration-job.yaml

@@ -1,8 +1,9 @@
 {{- if .Values.dbMigration.enabled }}
+{{ $version := printf "v%s" .Chart.Version -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "ftl.fullname" . }}-dbmig-{{ .Values.controller.image.tag | default .Chart.Version }}
+  name: {{ include "ftl.fullname" . }}-dbmig-{{ .Values.controller.image.tag | default $version }}
   labels:
     {{- include "ftl.labels" . | nindent 4 }}
 spec:
@@ -18,7 +19,7 @@ spec:
       restartPolicy: OnFailure
       containers:
         - name: dbmig
-          image: "{{ .Values.controller.image.repository | replace "controller" "runner" }}:{{ .Values.controller.image.tag | default .Chart.Version }}"
+          image: "{{ .Values.controller.image.repository | replace "controller" "runner" }}:{{ .Values.controller.image.tag | default $version }}"
           env:
             {{- if not .Values.postgresql.enabled }}
             - name: FTL_CONTROLLER_DSN

deployment/Justfile

@@ -73,9 +73,7 @@ apply:
   helm upgrade --install ftl ../charts -f values.yaml
 
 deploy-version version: setup-cluster
-  # Ideally this would point to https://github.com/TBD54566975/ftl//deployment/overlays/dev/?ref={{version}} but that doesn't work due to symlinks
-  # For now this is using the new config with a released image
-  helm upgrade --install ftl ../charts -f values.yaml --set controller.image.tag={{version}} --set controller.image.repository=ftl0/ftl-controller
+  helm upgrade --install ftl ../charts --version={{version}} -f values-release.yaml
 
 delete:
   helm uninstall ftl

deployment/values-release.yaml

@@ -0,0 +1,14 @@
+fullnameOverride: "ftl"
+ingress:
+  enabled: true
+  annotations:
+    ingress.kubernetes.io/ssl-redirect: "false"
+    kubernetes.io/ingress.class: traefik
+controller:
+  service:
+    ports:
+      - name: "http-8892"
+        port: 8892
+
+istio:
+  enabled: true