Update charts

TBD54566975 · Nov 18, 2024 · 5ca714b · 5ca714b
1 parent fc993ae
commit 5ca714b
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 26 deletions.
diff --git a/charts/ftl/Chart.lock b/charts/ftl/Chart.lock
@@ -2,8 +2,5 @@ dependencies:
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 15.5.38
-- name: harbor
-  repository: https://helm.goharbor.io
-  version: 1.15.1
-digest: sha256:5a14d0cc902b2697bdf1f726abbe44a58c75a9d54b4c5f8780d44136003153a5
-generated: "2024-10-14T00:01:15.60650687Z"
+digest: sha256:67269c8ba9048da425bdc3e6f8e28bff54bdb98e1c53a8dc0feb0b77363b48a9
+generated: "2024-11-06T10:54:22.116589+11:00"
diff --git a/charts/ftl/Chart.yaml b/charts/ftl/Chart.yaml
@@ -3,14 +3,10 @@ name: ftl
 description: |
   A Helm chart for Kubernetes that deploys FTL
 home: https://github.com/TBD54566975/ftl
-version: 0.396.0
-appVersion: 0.396.0
+version: 0.397.0
+appVersion: 0.397.0
 dependencies:
   - name: postgresql
     version: 15.5.38
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql.enabled
-  - name: harbor
-    version: v1.15.1
-    repository: https://helm.goharbor.io
-    condition: harbor.enabled
diff --git a/charts/ftl/templates/controller.yaml b/charts/ftl/templates/controller.yaml
@@ -57,6 +57,22 @@ spec:
             - name: FTL_KMS_URI
               value: "{{ .Values.controller.kmsUri }}"
             {{- end }}
+            - name: FTL_ARTEFACT_REGISTRY
+              value: "{{ .Values.registry.repository }}"
+            - name: FTL_ARTEFACT_REGISTRY_ALLOW_INSECURE
+              value: "{{ .Values.registry.allowInsecure }}"
+            - name: FTL_ARTEFACT_REGISTRY_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "ftl.fullname" . }}-secrets
+                  key: FTL_CONTROLLER_REGISTRY_USERNAME
+                  optional: true
+            - name: FTL_ARTEFACT_REGISTRY_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "ftl.fullname" . }}-secrets
+                  key: FTL_CONTROLLER_REGISTRY_PASSWORD
+                  optional: true
           ports:
             {{- range .Values.controller.ports }}
             - name: {{ .name }}

diff --git a/charts/ftl/templates/registry.yaml b/charts/ftl/templates/registry.yaml
@@ -0,0 +1,37 @@
+{{- if .Values.registry.create }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: registry
+  name: registry
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: registry
+  template:
+    metadata:
+      labels:
+        app: registry
+    spec:
+      containers:
+        - name: registry
+          image: registry:2
+          ports:
+            - containerPort: 5000
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "ftl.fullname" . }}-registry
+spec:
+  ports:
+    - name: http
+      port: 5000
+      protocol: TCP
+      targetPort: 5000
+  selector:
+    app: registry
+  type:  "ClusterIP"
+{{- end }}
diff --git a/charts/ftl/templates/runner.yaml b/charts/ftl/templates/runner.yaml
@@ -15,6 +15,7 @@ data:
         - name: verbs
           protocol: TCP
           port: 8893
+          appProtocol: http
           targetPort: 8893
       type: ClusterIP
   deploymentTemplate: |-
@@ -59,6 +60,22 @@ data:
                 {{- if .Values.runner.env }}
                 {{- toYaml .Values.runner.env | nindent 16 }}
                 {{- end }}
+                - name: FTL_ARTEFACT_REGISTRY
+                  value: "{{ .Values.registry.repository }}"
+                - name: FTL_ARTEFACT_REGISTRY_ALLOW_INSECURE
+                  value: "{{ .Values.registry.allowInsecure }}"
+                - name: FTL_ARTEFACT_REGISTRY_USERNAME
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ include "ftl.fullname" . }}-secrets
+                      key: FTL_RUNNER_REGISTRY_USERNAME
+                      optional: true
+                - name: FTL_ARTEFACT_REGISTRY_PASSWORD
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ include "ftl.fullname" . }}-secrets
+                      key: FTL_RUNNER_REGISTRY_PASSWORD
+                      optional: true
               ports:
                 {{- range .Values.runner.ports }}
                 - name: {{ .name }}

diff --git a/charts/ftl/templates/secrets.yaml b/charts/ftl/templates/secrets.yaml
@@ -8,3 +8,7 @@ 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 }}
diff --git a/charts/ftl/values.yaml b/charts/ftl/values.yaml
@@ -9,6 +9,10 @@ ingress:
 secrets:
   logEncryptionKey: null
   asyncEncryptionKey: null
+  controllerRegistryUsername: null
+  controllerRegistryPassword: null
+  runnerRegistryUsername: null
+  runnerRegistryPassword: null
 
 dbMigration:
   enabled: true
@@ -186,10 +190,6 @@ runner:
       valueFrom:
         fieldRef:
           fieldPath: status.hostIP
-#    - name: OTEL_EXPORTER_OTLP_ENDPOINT
-#      value: "http://$(HOST_IP):4317"
-#    - name: OTEL_RESOURCE_ATTRIBUTES
-#      value: "env=ftlDefault"
 
   ports:
     - name: http
@@ -211,16 +211,6 @@ runner:
   topologySpreadConstraints: null
   tolerations: null
 
-harbor:
-  enabled: false
-  expose:
-    tls:
-      enabled: false
-    type: nodePort
-  persistence:
-    enabled: true
-    resourcePolicy: ""
-
 postgresql:
   enabled: true
   architecture: standalone
@@ -238,4 +228,9 @@ postgresql:
         database: ftl
 
 istio:
-  enabled: false # set to true to have this chart install the grpc config to enable trailers
+  enabled: false # set to true to have this chart install the grpc config to enable trailers
+
+registry:
+  repository: ""
+  allowInsecure: false
+  create: false