From 99a88d30757a1e3c78c571f504728540ca040a62 Mon Sep 17 00:00:00 2001
From: alecthomas <alecthomas@users.noreply.github.com>
Date: Mon, 16 Dec 2024 02:32:00 +0000
Subject: [PATCH] Update charts

---
 charts/ftl/Chart.yaml                      |  6 +-
 charts/ftl/templates/admin-deployment.yaml |  7 ---
 charts/ftl/templates/controller.yaml       |  7 ---
 charts/ftl/templates/db-migration-job.yaml | 71 ----------------------
 charts/ftl/values.yaml                     |  2 +-
 5 files changed, 4 insertions(+), 89 deletions(-)
 delete mode 100644 charts/ftl/templates/db-migration-job.yaml

diff --git a/charts/ftl/Chart.yaml b/charts/ftl/Chart.yaml
index 651b5ed..1392e1a 100644
--- a/charts/ftl/Chart.yaml
+++ b/charts/ftl/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: ftl
 description: |
   A Helm chart for Kubernetes that deploys FTL
-home: https://github.com/TBD54566975/ftl
-version: 0.411.0
-appVersion: 0.411.0
+home: https://github.com/block/ftl
+version: 0.412.1
+appVersion: 0.412.1
 dependencies:
   - name: postgresql
     version: 15.5.38
diff --git a/charts/ftl/templates/admin-deployment.yaml b/charts/ftl/templates/admin-deployment.yaml
index 2b204aa..d6caf9e 100644
--- a/charts/ftl/templates/admin-deployment.yaml
+++ b/charts/ftl/templates/admin-deployment.yaml
@@ -46,13 +46,6 @@ spec:
             {{- if .Values.admin.env }}
             {{- toYaml .Values.admin.env | nindent 12 }}
             {{- end }}
-            {{- if not .Values.postgresql.enabled }}
-            - name: FTL_DSN
-              value: "{{ .Values.admin.dbConnectionString }}"
-            {{- else }}
-            - name: FTL_DSN
-              value: "postgres://{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.global.postgresql.auth.database }}?sslmode=disable&user={{ .Values.postgresql.global.postgresql.auth.username }}&password={{ .Values.postgresql.global.postgresql.auth.password }}"
-            {{- end }}
 
           ports:
             {{- range .Values.admin.ports }}
diff --git a/charts/ftl/templates/controller.yaml b/charts/ftl/templates/controller.yaml
index 6a9a726..07f53c6 100644
--- a/charts/ftl/templates/controller.yaml
+++ b/charts/ftl/templates/controller.yaml
@@ -46,13 +46,6 @@ spec:
             {{- if .Values.controller.env }}
             {{- toYaml .Values.controller.env | nindent 12 }}
             {{- end }}
-            {{- if not .Values.postgresql.enabled }}
-            - name: FTL_DSN
-              value: "{{ .Values.controller.dbConnectionString }}"
-            {{- else }}
-            - name: FTL_DSN
-              value: "postgres://{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.global.postgresql.auth.database }}?sslmode=disable&user={{ .Values.postgresql.global.postgresql.auth.username }}&password={{ .Values.postgresql.global.postgresql.auth.password }}"
-            {{- end }}
             - name: FTL_TIMELINE_ENDPOINT
               value: http://ftl-timeline:8892
             - name: FTL_LEASE_ENDPOINT
diff --git a/charts/ftl/templates/db-migration-job.yaml b/charts/ftl/templates/db-migration-job.yaml
deleted file mode 100644
index e82fc6d..0000000
--- a/charts/ftl/templates/db-migration-job.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-{{- 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 $version }}
-  labels:
-    {{- include "ftl.labels" . | nindent 4 }}
-spec:
-  activeDeadlineSeconds: 900
-  template:
-    metadata:
-      annotations:
-        sidecar.istio.io/inject: "false"
-      labels:
-        {{- include "ftl.labels" . | nindent 8 }}
-    spec:
-      serviceAccountName: {{ include "ftl.fullname" . }}-dbmig
-      restartPolicy: OnFailure
-      containers:
-        - name: dbmig
-          image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default $version }}"
-          env:
-            {{- if not .Values.postgresql.enabled }}
-            - name: DATABASE_URL
-              value: "{{ .Values.controller.dbConnectionString }}"
-            {{- else }}
-            - name: DATABASE_URL
-              value: "postgres://{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.global.postgresql.auth.database }}?sslmode=disable&user={{ .Values.postgresql.global.postgresql.auth.username }}&password={{ .Values.postgresql.global.postgresql.auth.password }}"
-            {{- end }}
-          command:
-            - /root/ftl
-            - migrate
-  backoffLimit: 4
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ftl.fullname" . }}-dbmig
-  labels:
-    {{- include "ftl.labels" . | nindent 4 }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "ftl.fullname" . }}-dbmig-role
-  labels:
-    {{- include "ftl.labels" . | nindent 4 }}
-rules:
-  - apiGroups: ["apps"]
-    resources: ["deployments"]
-    verbs: ["get", "list"]
-  - apiGroups: [""]
-    resources: ["pods"]
-    verbs: ["get", "list"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "ftl.fullname" . }}-dbmig-rolebinding
-  labels:
-    {{- include "ftl.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "ftl.fullname" . }}-dbmig-role
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "ftl.fullname" . }}-dbmig
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/charts/ftl/values.yaml b/charts/ftl/values.yaml
index 85cda9f..2125d48 100644
--- a/charts/ftl/values.yaml
+++ b/charts/ftl/values.yaml
@@ -208,7 +208,7 @@ cron:
       value: "true"
 
 postgresql:
-  enabled: true
+  enabled: false
   architecture: standalone
   primary:
     resources: