From 364f4fed50300d1a05e42a5f07c74bc7c8736de7 Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Tue, 3 Oct 2023 20:01:20 -0500
Subject: [PATCH] common: Add config shared by all hosts

The `common.yaml` Butane configuration file merges in all the other
various Butane configuration files that we want to share amonst all
CoreOS machines.  These include the authorized SSH keys list, collectd
deployment, SSH host certificate configuration, etc.
---
 common.yaml         | 11 +++++++++++
 k8s-aarch64-n0.yaml |  3 ++-
 nvr1.yaml           |  4 +---
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 common.yaml

diff --git a/common.yaml b/common.yaml
new file mode 100644
index 0000000..0057690
--- /dev/null
+++ b/common.yaml
@@ -0,0 +1,11 @@
+variant: fcos
+version: 1.4.0
+
+ignition:
+  config:
+    merge:
+    - local: sshkeys.ign
+    - local: collectd.ign
+    - local: local_exporter.ign
+    - local: notify-shutdown.ign
+    - local: step-ssh.ign
diff --git a/k8s-aarch64-n0.yaml b/k8s-aarch64-n0.yaml
index 15c6355..7480fab 100644
--- a/k8s-aarch64-n0.yaml
+++ b/k8s-aarch64-n0.yaml
@@ -3,8 +3,9 @@ version: 1.4.0
 ignition:
   config:
     merge:
-    - local: sshkeys.ign
+    - local: common.ign
     - local: kubelet.ign
+
 storage:
   files:
   - path: /etc/hostname
diff --git a/nvr1.yaml b/nvr1.yaml
index 790d9d7..00bfe44 100644
--- a/nvr1.yaml
+++ b/nvr1.yaml
@@ -4,13 +4,11 @@ version: 1.4.0
 ignition:
   config:
     merge:
-    - local: sshkeys.ign
+    - local: common.ign
     - local: zram.ign
     - local: gasket-driver.ign
     - local: frigate.ign
-    - local: collectd.ign
     - local: nginx.ign
-    - local: notify-shutdown.ign
 
 kernel_arguments:
   should_exist: