fix: cleanup lease service in charts (#4281)

block · Feb 4, 2025 · 253967e · 253967e
1 parent 4a451c7
commit 253967e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 39 deletions.
diff --git a/charts/ftl/templates/lease-services.yaml b/charts/ftl/templates/lease-services.yaml
@@ -10,12 +10,10 @@ metadata:
   {{- end }}
 spec:
   ports:
-    {{- range .Values.lease.service.ports }}
-    - name: {{ .name }}
-      port: {{ .port }}
-      protocol: {{ .protocol | default "TCP" }}
-      targetPort: {{ .targetPort }}
-    {{- end }}
+    - name: "http2"
+      port: {{ .Values.lease.port }}
+      protocol: "TCP"
+      targetPort: {{ .Values.lease.port }}
   selector:
     {{- include "ftl-lease.selectorLabels" . | nindent 4 }}
-  type: {{ .Values.lease.service.type | default "ClusterIP" }}
+  type: "ClusterIP"
diff --git a/charts/ftl/templates/lease-deployment.yaml → charts/ftl/templates/lease.yaml b/charts/ftl/templates/lease-deployment.yaml → charts/ftl/templates/lease.yaml
@@ -15,10 +15,14 @@ spec:
     metadata:
       labels:
         {{- include "ftl-lease.selectorLabels" . | nindent 8 }}
-      {{- if .Values.lease.podAnnotations }}
       annotations:
+      {{- if .Values.lease.podAnnotations }}
         {{- toYaml .Values.lease.podAnnotations | nindent 8 }}
       {{- end }}
+      {{ if .Values.istio.holdApplicationUntilProxyStarts }}
+        proxy.istio.io/config: |
+          holdApplicationUntilProxyStarts: true
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.lease.serviceAccountName }}
       containers:
@@ -42,13 +46,21 @@ spec:
             {{- if .Values.lease.env }}
             {{- toYaml .Values.lease.env | nindent 12 }}
             {{- end }}
-
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: FTL_BIND
+              value: "http://0.0.0.0:8892"
+            - name: LOG_LEVEL
+              value: "{{ .Values.lease.logLevel }}"
+            - name: LOG_JSON
+              value: "{{ .Values.lease.logJson }}"
           ports:
-            {{- range .Values.lease.ports }}
-            - name: {{ .name }}
-              containerPort: {{ .containerPort }}
-              protocol: {{ .protocol | default "TCP" }}
-            {{- end }}
+            - name: "http2"
+              containerPort: 8892
+              hostPort: {{ .Values.lease.port }}
+              protocol: "TCP"
           readinessProbe:
             {{- if .Values.lease.readinessProbe }}
             {{- toYaml .Values.lease.readinessProbe | nindent 12 }}

diff --git a/charts/ftl/values.yaml b/charts/ftl/values.yaml
@@ -229,6 +229,7 @@ postgresql:
 
 istio:
   enabled: false # set to true to have this chart install the grpc config to enable trailers
+  holdApplicationUntilProxyStarts: true
 
 registry:
   repository: ""
@@ -483,22 +484,10 @@ console:
   tolerations: null
 
 lease:
-  env:
-    - name: MY_POD_IP
-      valueFrom:
-        fieldRef:
-          fieldPath: status.podIP
-    - name: FTL_BIND
-      value: "http://0.0.0.0:8892"
-    - name: LOG_LEVEL
-      value: "debug"
-    - name: LOG_JSON
-      value: "true"
-  ports:
-    - name: http2
-      containerPort: 8892
-      protocol: TCP
-      port: 8892
+  env: null
+  port: 8892
+  logLevel: debug
+  logJson: true
 
   replicas: 1
   revisionHistoryLimit: 0
@@ -521,17 +510,9 @@ lease:
   readinessProbe: null
 
   service:
-    type: ClusterIP
     annotations: null
-    ports:
-      - name: "http2"
-        port: 8892
-        protocol: TCP
-        targetPort: 8892
 
-  podAnnotations:
-    proxy.istio.io/config: |
-      holdApplicationUntilProxyStarts: true
+  podAnnotations: null
   nodeSelector: null
   affinity: null
   topologySpreadConstraints: null