Add customPlugins and unsupportedBuiltInPlugins sections to spire-server

charts/spire/README.md

@@ -323,6 +323,10 @@ Now you can interact with the Spire agent socket from your own application. The
 | spire-server.controllerManager.service.port | int | `443` |  |
 | spire-server.controllerManager.service.type | string | `"ClusterIP"` |  |
 | spire-server.controllerManager.validatingWebhookConfiguration.failurePolicy | string | `"Fail"` |  |
+| spire-server.customPlugins.KeyManager | object | `{}` |  |
+| spire-server.customPlugins.NodeAttestor | object | `{}` |  |
+| spire-server.customPlugins.Notifier | object | `{}` |  |
+| spire-server.customPlugins.UpstreamAuthority | object | `{}` |  |
 | spire-server.dataStore.sql.databaseName | string | `"spire"` | Only used by "postgres" or "mysql" |
 | spire-server.dataStore.sql.databaseType | string | `"sqlite3"` | Other supported databases are "postgres" and "mysql" |
 | spire-server.dataStore.sql.host | string | `""` | Only used by "postgres" or "mysql" |

charts/spire/charts/spire-server/README.md

@@ -121,6 +121,10 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | controllerManager.service.port | int | `443` |  |
 | controllerManager.service.type | string | `"ClusterIP"` |  |
 | controllerManager.validatingWebhookConfiguration.failurePolicy | string | `"Fail"` |  |
+| customPlugins.KeyManager | object | `{}` |  |
+| customPlugins.NodeAttestor | object | `{}` |  |
+| customPlugins.Notifier | object | `{}` |  |
+| customPlugins.UpstreamAuthority | object | `{}` |  |
 | dataStore.sql.databaseName | string | `"spire"` | Only used by "postgres" or "mysql" |
 | dataStore.sql.databaseType | string | `"sqlite3"` | Other supported databases are "postgres" and "mysql" |
 | dataStore.sql.host | string | `""` | Only used by "postgres" or "mysql" |

charts/spire/charts/spire-server/templates/_helpers.tpl

@@ -194,3 +194,50 @@ The code below determines what connection type should be used.
 {{- define "spire-tornjak.servicename" -}}
 {{- include "spire-tornjak.backend" . -}}
 {{- end -}}
+
+{{/*
+Take a copy of the config and merge in .Values.customPlugins and .Values.unsupportedBuiltInPlugins passed through as root.
+*/}}
+{{- define "spire-server.config_merge" }}
+{{- $pluginsToMerge := dict "plugins" dict }}
+{{- range $type, $val := .root.Values.customPlugins }}
+{{-   if . }}
+{{-     $_ := set $pluginsToMerge.plugins $type (deepCopy $val) }}
+{{-   end }}
+{{- end }}
+{{- range $type, $val := .root.Values.unsupportedBuiltInPlugins }}
+{{-   if . }}
+{{-     $_ := set $pluginsToMerge.plugins $type (deepCopy $val) }}
+{{-   end }}
+{{- end }}
+{{- $newConfig := .config | fromYaml | mustMerge $pluginsToMerge }}
+{{- $newConfig | toYaml }}
+{{- end }}
+
+{{/*
+Take a copy of the plugin section and return a yaml string based version
+reformatted from a dict of dicts to a dict of lists of dicts
+*/}}
+{{- define "spire-server.plugins_reformat" }}
+{{- range $type, $v := . }}
+{{ $type }}:
+{{-   range $name, $v2 := $v }}
+    - {{ $name }}: {{ $v2 | toYaml | nindent 8 }}
+{{-   end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Take a copy of the config as a yaml config and root var.
+Merge in .root.Values.customPlugins and .Values.unsupportedBuiltInPlugins into config,
+Reformat the plugin section from a dict of dicts to a dict of lists of dicts,
+and export it back as as json string.
+This makes it much easier for users to merge in plugin configs, as dicts are easier
+to merge in values, but spire needs arrays.
+*/}}
+{{- define "spire-server.reformat-and-yaml2json" -}}
+{{- $config := include "spire-server.config_merge" . | fromYaml }}
+{{- $plugins := include "spire-server.plugins_reformat" $config.plugins | fromYaml }}
+{{- $_ := set $config "plugins" $plugins }}
+{{- $config | toPrettyJson }}
+{{- end }}

charts/spire/charts/spire-server/templates/configmap.yaml

@@ -1,3 +1,21 @@
+{{- range $type, $tvals := .Values.customPlugins }}
+{{-   if not (has $type (list "KeyManager" "NodeAttestor" "UpstreamAuthority" "Notifier")) }}
+{{-     fail (printf "Unknown plugin type specified: %s" $type) }}
+{{-   end }}
+{{-   range $name, $nval := $tvals }}
+{{-     if not (hasKey $nval "plugin_cmd") }}
+{{-       fail (printf "plugin_cmd is a required field. %s" $name) }}
+{{-     end }}
+{{-     if not (hasKey $nval "plugin_checksum") }}
+{{-       fail (printf "plugin_checksum is a required field.") }}
+{{-     end }}
+{{-     range $sname, $svals := $nval }}
+{{-       if not (has $sname (list "plugin_cmd" "plugin_checksum" "plugin_data")) }}
+{{-         fail (printf "Unknown plugin setting specified: %s" $sname) }}
+{{-       end }}
+{{-     end }}
+{{-   end }}
+{{- end }}
 {{- define "spire-server.yaml-config" -}}
 {{- $upstreamAuthorityUsed := 0 }}
 {{- $root := . }}
@@ -32,71 +50,71 @@ server:
 
 plugins:
   DataStore:
-    - sql:
-        plugin_data:
-          {{ include "spire-server.datastore-config" . | nindent 10 }}
+    sql:
+      plugin_data:
+        {{ include "spire-server.datastore-config" . | nindent 10 }}
 
   {{- with .Values.nodeAttestor.k8sPsat }}
   {{- if eq (.enabled | toString) "true" }}
   NodeAttestor:
-    - k8s_psat:
-        plugin_data:
-          clusters:
-            {{ include "spire-lib.cluster-name" $root }}:
-              service_account_allow_list: {{ include "spire-server.serviceAccountAllowedList" $root | trim }}
+    k8s_psat:
+      plugin_data:
+        clusters:
+          {{ include "spire-lib.cluster-name" $root }}:
+            service_account_allow_list: {{ include "spire-server.serviceAccountAllowedList" $root | trim }}
   {{- end }}
   {{- end }}
 
   KeyManager:
-    - disk:
-        plugin_data:
-          keys_path: "/run/spire/data/keys.json"
+    disk:
+      plugin_data:
+        keys_path: "/run/spire/data/keys.json"
 
   Notifier:
-    - k8sbundle:
-        plugin_data:
-          namespace: {{ .Values.notifier.k8sbundle.namespace | default (include "spire-server.namespace" .) | quote }}
-          config_map: {{ include "spire-lib.bundle-configmap" . | quote }}
+    k8sbundle:
+      plugin_data:
+        namespace: {{ .Values.notifier.k8sbundle.namespace | default (include "spire-server.namespace" .) | quote }}
+        config_map: {{ include "spire-lib.bundle-configmap" . | quote }}
 
   {{- with .Values.upstreamAuthority.disk }}
   {{- if eq (.enabled | toString) "true" }}
   {{- $upstreamAuthorityUsed = add1 $upstreamAuthorityUsed }}
   UpstreamAuthority:
-    - disk:
-        plugin_data:
-          cert_file_path: "/run/spire/upstream_ca/tls.crt"
-          key_file_path: "/run/spire/upstream_ca/tls.key"
-          {{- if ne .secret.data.bundle "" }}
-          bundle_file_path: "/run/spire/upstream_ca/bundle.crt"
-          {{- end }}
+    disk:
+      plugin_data:
+        cert_file_path: "/run/spire/upstream_ca/tls.crt"
+        key_file_path: "/run/spire/upstream_ca/tls.key"
+        {{- if ne .secret.data.bundle "" }}
+        bundle_file_path: "/run/spire/upstream_ca/bundle.crt"
+        {{- end }}
   {{- end }}
   {{- end }}
 
   {{- with .Values.upstreamAuthority.certManager }}
   {{- if eq (.enabled | toString) "true" }}
   {{- $upstreamAuthorityUsed = add1 $upstreamAuthorityUsed }}
   UpstreamAuthority:
-    - cert-manager:
-        plugin_data:
-          issuer_name: {{ default (include "spire-server.fullname" $root) .issuer_name }}-ca
-          issuer_kind: {{ .issuer_kind | quote }}
-          issuer_group: {{ .issuer_group | quote }}
-          namespace: {{ default $root.Release.Namespace .namespace | quote }}
-          {{- if ne .kube_config_file "" }}
-          kube_config_file: {{ .kube_config_file | quote }}
-          {{- end }}
+    cert-manager:
+      plugin_data:
+        issuer_name: {{ default (include "spire-server.fullname" $root) .issuer_name }}-ca
+        issuer_kind: {{ .issuer_kind | quote }}
+        issuer_group: {{ .issuer_group | quote }}
+        namespace: {{ default $root.Release.Namespace .namespace | quote }}
+        {{- if ne .kube_config_file "" }}
+        kube_config_file: {{ .kube_config_file | quote }}
+        {{- end }}
   {{- end }}
   {{- end }}
 
   {{- with .Values.upstreamAuthority.spire }}
   {{- if eq (.enabled | toString) "true" }}
   {{- $upstreamAuthorityUsed = add1 $upstreamAuthorityUsed }}
   UpstreamAuthority:
-    - spire:
-        plugin_data:
-          server_address: {{ .server.address | quote }}
-          server_port: {{ .server.port }}
-          workload_api_socket: "/run/spire/upstream_agent/spire-agent.sock"
+    spire:
+      plugin_data:
+        server_address: {{ .server.address | quote }}
+        server_port: {{ .server.port }}
+        workload_api_socket: "/run/spire/upstream_agent/spire-agent.sock"
   {{- end }}
   {{- end }}
 
@@ -152,4 +170,4 @@ metadata:
   {{- end }}
 data:
   server.conf: |
-    {{- include "spire-server.yaml-config" . | fromYaml | toPrettyJson | nindent 4 }}
+    {{- include "spire-server.reformat-and-yaml2json" (dict "config" (include "spire-server.yaml-config" .) "root" .) | nindent 4 }}

charts/spire/charts/spire-server/values.yaml

@@ -434,6 +434,22 @@ tornjak:
     #   cpu: 100m
     #   memory: 128Mi
 
+# NOTE: This is unsupported and only to configure currently supported spire built in plugins but plugins unsupported by the chart.
+# Upgrades wont be tested for anything under this config. If you need this, please let the chart developers know your needs so we
+# can prioritize proper support.
+# @ignored
+unsupportedBuiltInPlugins:
+  KeyManager: {}
+  NodeAttestor: {}
+  UpstreamAuthority: {}
+  Notifier: {}
+
+customPlugins:
+  KeyManager: {}
+  NodeAttestor: {}
+  UpstreamAuthority: {}
+  Notifier: {}
+
 # @ignored
 tests:
   bash:

examples/spire-plugins/node-agent-tpm/Dockerfile.agent

@@ -0,0 +1,9 @@
+FROM alpine
+RUN \
+  cd /tmp && \
+  wget -O plugin.tar.gz https://github.com/boxboat/spire-tpm-plugin/releases/download/v1.3.3/spire_tpm_plugin_tpm_attestor_agent_linux_amd64_v1.3.3.tar.gz && \
+  tar -zxvf plugin.tar.gz && \
+  mv tpm_attestor_agent /
+
+FROM ghcr.io/spiffe/spire-server:1.5.4
+COPY --from=0 /tpm_attestor_agent /bin/tpm_attestor_agent

examples/spire-plugins/node-agent-tpm/Dockerfile.server

@@ -0,0 +1,9 @@
+FROM alpine
+RUN \
+  cd /tmp && \
+  wget -O plugin.tar.gz https://github.com/boxboat/spire-tpm-plugin/releases/download/v1.3.3/spire_tpm_plugin_tpm_attestor_server_linux_amd64_v1.3.3.tar.gz && \
+  tar -zxvf plugin.tar.gz && \
+  mv tpm_attestor_server /
+
+FROM ghcr.io/spiffe/spire-server:1.5.4
+COPY --from=0 /tpm_attestor_server /bin/tpm_attestor_server

examples/spire-plugins/node-agent-tpm/values.yaml

@@ -0,0 +1,25 @@
+spire-server:
+  initContainers:
+  - name: tpm-init
+    image: busybox
+    command:
+    - sh
+    - -c
+    - |
+      mkdir -p /run/spire/data/certs
+      mkdir -p /run/spire/data/hashes
+    volumeMounts:
+    - mountPath: /run/spire/data
+      name: spire-data
+  image:
+    registry: docker.io
+    repository: kfox1111/misc
+    version: tpm-server-test
+  customPlugins:
+    NodeAttestor:
+      tpm:
+        plugin_cmd: /bin/tpm_attestor_server
+        plugin_checksum: 97442358ae946e3fb8f2464432b8c23efdc0b5d44ec1eea27babe59ef646cc2f
+        plugin_data:
+        - ca_path: /run/spire/data/certs
+          hash_path: /run/spire/data/hashes

tests/unit/spire_test.go

@@ -41,4 +41,34 @@ spire-server:
 			Expect(notes).Should(ContainSubstring("abc123"))
 		})
 	})
+	Describe("spire-server.customPlugin.tpm", func() {
+		It("plugin set ok", func() {
+			objs, err := ValueStringRender(chart, `
+spire-server:
+  customPlugins:
+    NodeAttestor:
+      tpm:
+        plugin_cmd: /bin/tpm_attestor_server
+        plugin_checksum: 97442358ae946e3fb8f2464432b8c23efdc0b5d44ec1eea27babe59ef646cc2f
+        plugin_data: {}
+`)
+			Expect(err).Should(Succeed())
+			notes := objs["spire/charts/spire-server/templates/configmap.yaml"]
+			Expect(notes).Should(ContainSubstring("tpm"))
+		})
+	})
+	Describe("spire-server.unsupportedBuiltInPlugins", func() {
+		It("plugin set ok", func() {
+			objs, err := ValueStringRender(chart, `
+spire-server:
+  unsupportedBuiltInPlugins:
+    NodeAttestor:
+      join_token:
+        plugin_data: {}
+`)
+			Expect(err).Should(Succeed())
+			notes := objs["spire/charts/spire-server/templates/configmap.yaml"]
+			Expect(notes).Should(ContainSubstring("join_token"))
+		})
+	})
 })