feat: configure provisioner through ConfigMap (#3135)

TBD54566975 · Oct 16, 2024 · 0175b61 · 0175b61
1 parent 0a53566
commit 0175b61
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git a/Dockerfile.provisioner b/Dockerfile.provisioner
@@ -35,7 +35,7 @@ FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
 WORKDIR /plugins/
-COPY ftl-provisioner-config.toml .
+COPY ftl-provisioner-config.toml /config/config.toml
 COPY --from=builder /src/build/release/ftl-provisioner-cloudformation .
 
 WORKDIR /service/
@@ -45,6 +45,6 @@ EXPOSE 8893
 
 ENV PATH="$PATH:/plugins/"
 ENV FTL_PROVISIONER_BIND="http://0.0.0.0:8893"
-ENV FTL_PROVISIONER_PLUGIN_CONFIG_FILE="/plugins/config.toml"
+ENV FTL_PROVISIONER_PLUGIN_CONFIG_FILE="/config/config.toml"
 
 CMD ["/service/ftl-provisioner"]
diff --git a/charts/ftl/templates/provisioner-config-map.yaml b/charts/ftl/templates/provisioner-config-map.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.provisioner.enabled }}
+{{- if eq .Values.provisioner.configMap "ftl-provisioner-default-config" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ftl-provisioner-default-config
+  namespace: default
+data:
+  config.toml: |
+    default = "controller"
+    plugins = [
+        { id = "cloudformation", resources = ["postgres"] },
+        { id = "controller", resources = ["module"] },
+    ]
+{{- end}}
+{{- end}}
diff --git a/charts/ftl/templates/provisioner.yaml b/charts/ftl/templates/provisioner.yaml
@@ -59,6 +59,13 @@ spec:
             successThreshold: 1
             failureThreshold: 15
             {{- end }}
+          volumeMounts:
+            - mountPath: /config
+              name: config
+      volumes:
+        - name: config
+          configMap:
+            name: {{ .Values.provisioner.configMap }}
       {{- if .Values.provisioner.nodeSelector }}
       nodeSelector:
         {{- toYaml .Values.provisioner.nodeSelector | nindent 8 }}

diff --git a/charts/ftl/values.yaml b/charts/ftl/values.yaml
@@ -91,7 +91,7 @@ provisioner:
   enabled: false
   replicas: 1
   revisionHistoryLimit: 0
-
+  configMap: "ftl-provisioner-default-config"
   image:
     repository: "ftl0/ftl-provisioner"
     pullPolicy: IfNotPresent

diff --git a/deployment/Dockerfile.provisioner.test b/deployment/Dockerfile.provisioner.test
@@ -7,8 +7,7 @@ COPY docker-build/ftl-provisioner-cloudformation /plugins/
 COPY docker-build/ftl .
 EXPOSE 8893
 # Temp hack, this should be a configmap
-COPY ftl-provisioner-config.toml /plugins/config.toml
-ENV FTL_PROVISIONER_PLUGIN_CONFIG_FILE="/plugins/config.toml"
+ENV FTL_PROVISIONER_PLUGIN_CONFIG_FILE="/config/config.toml"
 ENV PATH="$PATH:/plugins/"
 
 CMD ["/root/ftl-provisioner"]
diff --git a/deployment/Justfile b/deployment/Justfile
@@ -47,7 +47,7 @@ setup-cluster: setup-registry
   fi
   kubectl config set-context --current --namespace=default
 
-install-istio:
+install-istio: setup-cluster
   #!/bin/bash
   if [ -z "$(kubectl get namespace | grep istio-system)" ]; then
       kubectl create namespace istio-system

diff --git a/deployment/ftl-provisioner-config.toml b/deployment/ftl-provisioner-config.toml