Merge pull request #1526 from lsst-it/IT-5614_rke_static_plugin

(cluster/yagan) add CNI static plugin
lsst-it · Nov 6, 2024 · 2ea7c79 · 2ea7c79
2 parents f5e4e09 + 82f1933
commit 2ea7c79
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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