From 82f193374f9be912dc73ab526bdb766d4b617ecf Mon Sep 17 00:00:00 2001
From: Carlos Barria <cbarria@yahoo.com>
Date: Tue, 5 Nov 2024 15:57:13 -0300
Subject: [PATCH] (cluster/k8s) add CNI static plugin in yagan/kueyen

---
 hieradata/cluster/kueyen.yaml                  | 1 +
 hieradata/cluster/yagan.yaml                   | 1 +
 hieradata/common.yaml                          | 3 +++
 spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb | 2 +-
 spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb   | 2 +-
 spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb   | 2 +-
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hieradata/cluster/kueyen.yaml b/hieradata/cluster/kueyen.yaml
index 0e177c7494..2173c0cf68 100644
--- a/hieradata/cluster/kueyen.yaml
+++ b/hieradata/cluster/kueyen.yaml
@@ -4,6 +4,7 @@ clustershell::groupmembers:
 profile::core::ospl::enable_rundir: true
 profile::core::k8snode::enable_dhcp: true
 tuned::active_profile: "latency-performance"
+cni::plugins::enable: ["macvlan", "static"]
 nm::connections:
   em1:  #PXE Boot
     content: |
diff --git a/hieradata/cluster/yagan.yaml b/hieradata/cluster/yagan.yaml
index 5704498614..62ed9bcb45 100644
--- a/hieradata/cluster/yagan.yaml
+++ b/hieradata/cluster/yagan.yaml
@@ -4,3 +4,4 @@ clustershell::groupmembers:
 profile::core::k8snode::enable_dhcp: true
 profile::core::ospl::enable_rundir: true
 tuned::active_profile: "latency-performance"
+cni::plugins::enable: ["macvlan", "static"]
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 9655630565..81af5d0085 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -104,6 +104,9 @@ lookup_options:
   rke2::config:
     merge:
       strategy: "deep"
+  cni::plugins::enable:
+    merge:
+      strategy: "deep"
 
 timezone::timezone: "UTC"
 chrony::cmdport: 0
diff --git a/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb b/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb
index dbfa98f34b..a2a7cdaa88 100644
--- a/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb
+++ b/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb
@@ -57,7 +57,7 @@
         is_expected.to contain_class('cni::plugins').with(
           version: '1.2.0',
           checksum: 'f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37',
-          enable: ['macvlan']
+          enable: %w[macvlan static]
         )
       end
 
diff --git a/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb
index ca85fcd2d8..8b3b5c8bf6 100644
--- a/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb
+++ b/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb
@@ -60,7 +60,7 @@
         is_expected.to contain_class('cni::plugins').with(
           version: '1.2.0',
           checksum: 'f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37',
-          enable: ['macvlan']
+          enable: %w[macvlan static]
         )
       end
 
diff --git a/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb
index d62e45b76a..18cd2fe27c 100644
--- a/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb
+++ b/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb
@@ -58,7 +58,7 @@
         is_expected.to contain_class('cni::plugins').with(
           version: '1.2.0',
           checksum: 'f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37',
-          enable: ['macvlan']
+          enable: %w[macvlan static]
         )
       end