From cfc7cb345e464c3f6fe59b3b660a2abf7374fb11 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 22 Mar 2026 00:01:16 +1100
Subject: [PATCH] fix: install filemapper gem and deploy generate-types cronjob
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The network module's interfaces provider requires puppetx/filemapper
which was not installed, causing catalog compilation failures with
"no such file to load -- puppetx/filemapper".

Adds filemapper to additional-ruby-gems.sh for puppetserver/compiler
pods, installs it directly in the generate-types cronjob (which has no
access to that script), and adds cronjob_generate-types.yaml to the
kustomization so the CronJob is actually deployed.

💘 Generated with Crush

Assisted-by: Claude Sonnet 4.6 via Crush <crush@charm.land>
---
 apps/base/puppet/cronjob_generate-types.yaml       | 1 +
 apps/base/puppet/kustomization.yaml                | 1 +
 apps/base/puppet/resources/additional-ruby-gems.sh | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/base/puppet/cronjob_generate-types.yaml b/apps/base/puppet/cronjob_generate-types.yaml
index 502099b..3773aea 100644
--- a/apps/base/puppet/cronjob_generate-types.yaml
+++ b/apps/base/puppet/cronjob_generate-types.yaml
@@ -35,6 +35,7 @@ spec:
                 - -c
               args:
                 - |
+                  /opt/puppetlabs/puppet/bin/gem install filemapper toml
                   find /etc/puppetlabs/code/environments -mindepth 1 -maxdepth 1 -type d | while read -r envdir; do
                     env="$(basename "$envdir")"
                     echo "Generating types for $env"
diff --git a/apps/base/puppet/kustomization.yaml b/apps/base/puppet/kustomization.yaml
index 7c43abd..417a6cc 100644
--- a/apps/base/puppet/kustomization.yaml
+++ b/apps/base/puppet/kustomization.yaml
@@ -7,6 +7,7 @@ resources:
   - cnpg_cluster.yaml
   - cnpg_pooler.yaml
   - cronjob_g10k-code.yaml
+  - cronjob_generate-types.yaml
   - persistentvolumeclaims.yaml
   - vaultauth.yaml
   - vaultstaticsecret.yaml
diff --git a/apps/base/puppet/resources/additional-ruby-gems.sh b/apps/base/puppet/resources/additional-ruby-gems.sh
index ea73a4b..839d2ae 100755
--- a/apps/base/puppet/resources/additional-ruby-gems.sh
+++ b/apps/base/puppet/resources/additional-ruby-gems.sh
@@ -3,4 +3,5 @@ set -e
 
 echo "Installing additional Ruby gems..."
 /opt/puppetlabs/puppet/bin/gem install toml
+/opt/puppetlabs/puppet/bin/gem install filemapper
 echo "Additional Ruby gems installed successfully"
-- 
2.47.3