From 094f7a73e598fe503ad9db3c45c41195d0fcd09d Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Tue, 24 Mar 2026 18:27:18 +1100
Subject: [PATCH] feat: update gems for puppet

- add deep_merge, ipaddr, and hiera-eyaml gems
- pin intel-device-plugins to 0.35.0
---
 apps/base/inteldeviceplugins-system/kustomization.yaml | 1 +
 apps/base/puppet/cronjob_generate-types.yaml           | 2 +-
 apps/base/puppet/resources/additional-ruby-gems.sh     | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/base/inteldeviceplugins-system/kustomization.yaml b/apps/base/inteldeviceplugins-system/kustomization.yaml
index 4a52d2e..bdd59a7 100644
--- a/apps/base/inteldeviceplugins-system/kustomization.yaml
+++ b/apps/base/inteldeviceplugins-system/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
 helmCharts:
   - name: intel-device-plugins-operator
     repo: https://intel.github.io/helm-charts/
+    version: "0.35.0"
     releaseName: intel-device-plugins-operator
     namespace: inteldeviceplugins-system
   - name: intel-device-plugins-gpu
diff --git a/apps/base/puppet/cronjob_generate-types.yaml b/apps/base/puppet/cronjob_generate-types.yaml
index 3773aea..8167823 100644
--- a/apps/base/puppet/cronjob_generate-types.yaml
+++ b/apps/base/puppet/cronjob_generate-types.yaml
@@ -35,7 +35,7 @@ spec:
                 - -c
               args:
                 - |
-                  /opt/puppetlabs/puppet/bin/gem install filemapper toml
+                  /opt/puppetlabs/puppet/bin/gem install deep_merge ipaddr hiera-eyaml 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/resources/additional-ruby-gems.sh b/apps/base/puppet/resources/additional-ruby-gems.sh
index 839d2ae..3ce798a 100755
--- a/apps/base/puppet/resources/additional-ruby-gems.sh
+++ b/apps/base/puppet/resources/additional-ruby-gems.sh
@@ -2,6 +2,8 @@
 set -e
 
 echo "Installing additional Ruby gems..."
+/opt/puppetlabs/puppet/bin/gem install deep_merge
+/opt/puppetlabs/puppet/bin/gem install ipaddr
+/opt/puppetlabs/puppet/bin/gem install hiera-eyaml
 /opt/puppetlabs/puppet/bin/gem install toml
-/opt/puppetlabs/puppet/bin/gem install filemapper
 echo "Additional Ruby gems installed successfully"